diff --git a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php index 3b490f0..6a09f15 100644 --- a/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php +++ b/core/lib/Drupal/Core/Field/Plugin/migrate/field/Email.php @@ -38,9 +38,17 @@ public function getFieldFormatterMap() { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/datetime/src/Plugin/migrate/field/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/DateField.php index 0dd56c9..d1ecedb 100644 --- a/core/modules/datetime/src/Plugin/migrate/field/DateField.php +++ b/core/modules/datetime/src/Plugin/migrate/field/DateField.php @@ -31,9 +31,17 @@ public function getFieldWidgetMap() { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { switch ($data['type']) { case 'date': $from_format = 'Y-m-d\TH:i:s'; diff --git a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php index c4e7b49..29601a5 100644 --- a/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php +++ b/core/modules/datetime/src/Plugin/migrate/field/d6/DateField.php @@ -36,9 +36,17 @@ public function getFieldWidgetMap() { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { switch ($data['type']) { case 'date': $from_format = 'Y-m-d\TH:i:s'; diff --git a/core/modules/file/src/Plugin/migrate/field/d6/FileField.php b/core/modules/file/src/Plugin/migrate/field/d6/FileField.php index 930c13b..9b81e17 100644 --- a/core/modules/file/src/Plugin/migrate/field/d6/FileField.php +++ b/core/modules/file/src/Plugin/migrate/field/d6/FileField.php @@ -38,9 +38,17 @@ public function getFieldFormatterMap() { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'd6_field_file', 'source' => $field_name, diff --git a/core/modules/file/src/Plugin/migrate/field/d7/FileField.php b/core/modules/file/src/Plugin/migrate/field/d7/FileField.php index 4243d43..608721f 100644 --- a/core/modules/file/src/Plugin/migrate/field/d7/FileField.php +++ b/core/modules/file/src/Plugin/migrate/field/d7/FileField.php @@ -14,9 +14,17 @@ class FileField extends D6FileField { /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php index 7783ae2..f570407 100644 --- a/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php +++ b/core/modules/file/src/Plugin/migrate/field/d7/ImageField.php @@ -14,9 +14,17 @@ class ImageField extends FieldPluginBase { /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/link/src/Plugin/migrate/field/d6/LinkField.php b/core/modules/link/src/Plugin/migrate/field/d6/LinkField.php index 0d03656..c9a5ea1 100644 --- a/core/modules/link/src/Plugin/migrate/field/d6/LinkField.php +++ b/core/modules/link/src/Plugin/migrate/field/d6/LinkField.php @@ -35,9 +35,17 @@ public function getFieldFormatterMap() { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'd6_field_link', 'source' => $field_name, diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateFieldInterface.php index 2aac5d1..de19646 100644 --- a/core/modules/migrate_drupal/src/Plugin/MigrateFieldInterface.php +++ b/core/modules/migrate_drupal/src/Plugin/MigrateFieldInterface.php @@ -93,7 +93,7 @@ public function getFieldWidgetMap(); * @param array $data * The array of field data from FieldValues::fieldData(). */ - public function processFieldValues(MigrationInterface $migration, $field_name, $data); + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data); /** * Computes the destination type of a migrated field. diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php index da1c7e9..b78570e 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php @@ -20,6 +20,14 @@ abstract class CckFieldPluginBase extends FieldPluginBase { /** + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. + */ + public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** * Apply any custom processing to the field bundle migrations. * * @param \Drupal\migrate\Plugin\MigrationInterface $migration @@ -29,7 +37,7 @@ * @param array $data * The array of field data from FieldValues::fieldData(). */ - public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { // Provide a bridge to the old method declared on the interface and now an // abstract method in this class. return $this->processCckFieldValues($migration, $field_name, $data); diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php index dc115ab..024f3a5 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/FieldPluginBase.php @@ -93,9 +93,17 @@ public function processFieldFormatter(MigrationInterface $migration) { } /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'get', 'source' => $field_name, diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php index 1579afa..21b05d7 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/NodeReference.php @@ -16,9 +16,17 @@ class NodeReference extends FieldPluginBase { /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php index 11df8ec..2099d96 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/field/UserReference.php @@ -16,9 +16,17 @@ class UserReference extends FieldPluginBase { /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php index 56ec20a..958901a 100644 --- a/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php +++ b/core/modules/taxonomy/src/Plugin/migrate/field/TaxonomyTermReference.php @@ -17,9 +17,17 @@ class TaxonomyTermReference extends FieldPluginBase { /** - * {@inheritdoc} + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. */ public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** + * {@inheritdoc} + */ + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $data) { $process = [ 'plugin' => 'iterator', 'source' => $field_name, diff --git a/core/modules/text/src/Plugin/migrate/field/d6/TextField.php b/core/modules/text/src/Plugin/migrate/field/d6/TextField.php index 62deeee..04c6bfc 100644 --- a/core/modules/text/src/Plugin/migrate/field/d6/TextField.php +++ b/core/modules/text/src/Plugin/migrate/field/d6/TextField.php @@ -40,9 +40,17 @@ public function getFieldFormatterMap() { } /** + * @deprecated in Drupal 8.5.x, to be removed before Drupal 9.0.x. Use + * defineFieldValueProcess() instead. + */ + public function processFieldValues(MigrationInterface $migration, $field_name, $data) { + return $this->defineFieldValueProcess($migration, $field_name, $data); + } + + /** * {@inheritdoc} */ - public function processFieldValues(MigrationInterface $migration, $field_name, $field_info) { + public function defineFieldValueProcess(MigrationInterface $migration, $field_name, $field_info) { $widget_type = isset($field_info['widget_type']) ? $field_info['widget_type'] : $field_info['widget']['type']; if ($widget_type == 'optionwidgets_onoff') {