diff --git a/core/modules/migrate_drupal/src/MigrationStorage.php b/core/modules/migrate_drupal/src/MigrationStorage.php index 3585998..baf10e2 100644 --- a/core/modules/migrate_drupal/src/MigrationStorage.php +++ b/core/modules/migrate_drupal/src/MigrationStorage.php @@ -99,7 +99,7 @@ public function loadMultiple(array $ids = NULL) { } // Allow modules providing cck field plugins to alter the required - // migrations for successfully migration a field type. + // migrations to assist with the migration a custom field type. $this->applyCckFieldProcessors($entities); // Build an array of dependencies and set the order of the migrations. @@ -134,13 +134,12 @@ public function save(EntityInterface $entity) { /** * Allow any field type plugins to adjust the migrations as required. * - * @param array $entities + * @param \Drupal\migrate\Entity\Migration[] $entities * An array of migration entities. */ protected function applyCckFieldProcessors(array $entities) { $method_map = $this->getMigrationPluginMethodMap(); - /** @var \Drupal\migrate\Entity\Migration $migration */ foreach ($entities as $entity_id => $migration) { // Allow field plugins to process the required migrations. @@ -192,8 +191,9 @@ protected function getCckFieldPlugins() { protected function getMigrationPluginMethodMap() { return [ 'd6_field' => 'processField', + 'd6_field_instance' => 'processFieldInstance', 'd6_field_instance_widget_settings' => 'processFieldWidget', - 'd6_field_formatter_settings' => 'processFieldDisplay', + 'd6_field_formatter_settings' => 'processFieldFormatter', ]; } diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php index 2cb59a7..baa8ca6 100644 --- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php +++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldInterface.php @@ -24,6 +24,14 @@ public function processField(MigrationInterface $migration); /** + * Apply any custom processing to the field instance migration. + * + * @param \Drupal\migrate\Entity\MigrationInterface $migration + * The migration entity. + */ + public function processFieldInstance(MigrationInterface $migration); + + /** * Apply any custom processing to the field widget migration. * * @param \Drupal\migrate\Entity\MigrationInterface $migration @@ -32,22 +40,22 @@ public function processField(MigrationInterface $migration); public function processFieldWidget(MigrationInterface $migration); /** - * Apply any custom processing to the field display migration. + * Apply any custom processing to the field formatter migration. * * @param \Drupal\migrate\Entity\MigrationInterface $migration * The migration entity. */ - public function processFieldDisplay(MigrationInterface $migration); + public function processFieldFormatter(MigrationInterface $migration); /** * Get a map between D6 formatters and D8 formatters for this field type. * - * This is used by static::processFieldDisplay() in the base class. + * This is used by static::processFieldFormatter() in the base class. * * @return array * The keys are D6 formatters and the values are D8 formatters. */ - public function getFieldDisplayMap(); + public function getFieldFormatterMap(); /** * Apply any custom processing to the cck bundle migrations. 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 561b761..5cbaee5 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php @@ -34,6 +34,13 @@ public function processField(MigrationInterface $migration) { /** * {@inheritdoc} */ + public function processFieldInstance(MigrationInterface $migration) { + // Nothing to do by default with field instances. + } + + /** + * {@inheritdoc} + */ public function processFieldWidget(MigrationInterface $migration) { $process['type']['map'][$this->pluginId] = $this->pluginId . '_default'; $migration->mergeProcessOfProperty('options/type', $process); @@ -42,9 +49,9 @@ public function processFieldWidget(MigrationInterface $migration) { /** * {@inheritdoc} */ - public function processFieldDisplay(MigrationInterface $migration) { + public function processFieldFormatter(MigrationInterface $migration) { $process = []; - foreach ($this->getFieldDisplayMap() as $source_format => $destination_format) { + foreach ($this->getFieldFormatterMap() as $source_format => $destination_format) { $process[0]['map'][$this->pluginId][$source_format] = $destination_format; } $migration->mergeProcessOfProperty('options/type', $process);