diff --git a/core/modules/field/migration_templates/d6_field.yml b/core/modules/field/migration_templates/d6_field.yml index 3157808..23d1ba0 100644 --- a/core/modules/field/migration_templates/d6_field.yml +++ b/core/modules/field/migration_templates/d6_field.yml @@ -2,7 +2,7 @@ id: d6_field label: Field configuration migration_tags: - Drupal 6 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processField source: plugin: d6_field diff --git a/core/modules/field/migration_templates/d6_field_formatter_settings.yml b/core/modules/field/migration_templates/d6_field_formatter_settings.yml index 7496db3..a103cfa 100644 --- a/core/modules/field/migration_templates/d6_field_formatter_settings.yml +++ b/core/modules/field/migration_templates/d6_field_formatter_settings.yml @@ -2,7 +2,7 @@ id: d6_field_formatter_settings label: Field formatter configuration migration_tags: - Drupal 6 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldFormatter source: plugin: d6_field_instance_per_view_mode diff --git a/core/modules/field/migration_templates/d6_field_instance.yml b/core/modules/field/migration_templates/d6_field_instance.yml index b5035c2..388c9ce 100644 --- a/core/modules/field/migration_templates/d6_field_instance.yml +++ b/core/modules/field/migration_templates/d6_field_instance.yml @@ -2,7 +2,7 @@ id: d6_field_instance label: Field instance configuration migration_tags: - Drupal 6 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldInstance source: plugin: d6_field_instance diff --git a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml index 46b7d75..aa7713e 100644 --- a/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml +++ b/core/modules/field/migration_templates/d6_field_instance_widget_settings.yml @@ -2,7 +2,7 @@ id: d6_field_instance_widget_settings label: Field instance widget configuration migration_tags: - Drupal 6 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldWidget source: plugin: d6_field_instance_per_form_display diff --git a/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml index 18135af..e3d4368 100644 --- a/core/modules/field/migration_templates/d7_field.yml +++ b/core/modules/field/migration_templates/d7_field.yml @@ -2,7 +2,7 @@ id: d7_field label: Field configuration migration_tags: - Drupal 7 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processField source: plugin: d7_field diff --git a/core/modules/field/migration_templates/d7_field_formatter_settings.yml b/core/modules/field/migration_templates/d7_field_formatter_settings.yml index ee07ec4..828a291 100644 --- a/core/modules/field/migration_templates/d7_field_formatter_settings.yml +++ b/core/modules/field/migration_templates/d7_field_formatter_settings.yml @@ -2,7 +2,7 @@ id: d7_field_formatter_settings label: Field formatter configuration migration_tags: - Drupal 7 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldFormatter source: plugin: d7_field_instance_per_view_mode diff --git a/core/modules/field/migration_templates/d7_field_instance.yml b/core/modules/field/migration_templates/d7_field_instance.yml index b6d2497..75ed18e 100644 --- a/core/modules/field/migration_templates/d7_field_instance.yml +++ b/core/modules/field/migration_templates/d7_field_instance.yml @@ -2,7 +2,7 @@ id: d7_field_instance label: Field instance configuration migration_tags: - Drupal 7 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldInstance source: plugin: d7_field_instance diff --git a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml index f88f2d2..b4e527a 100644 --- a/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml +++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml @@ -2,7 +2,7 @@ id: d7_field_instance_widget_settings label: Field instance widget configuration migration_tags: - Drupal 7 -class: Drupal\migrate_drupal\Plugin\migrate\CckMigration +class: Drupal\migrate_drupal\Plugin\migrate\FieldMigration cck_plugin_method: processFieldWidget source: plugin: d7_field_instance_per_form_display diff --git a/core/modules/field/src/Plugin/migrate/process/FieldType.php b/core/modules/field/src/Plugin/migrate/process/FieldType.php index 7874f9c..29f2502 100644 --- a/core/modules/field/src/Plugin/migrate/process/FieldType.php +++ b/core/modules/field/src/Plugin/migrate/process/FieldType.php @@ -60,7 +60,7 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('plugin.manager.migrate.cckfield'), + $container->get('plugin.manager.migrate.field'), $migration ); } diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php index d63b9c2..81109f5 100644 --- a/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php +++ b/core/modules/file/src/Plugin/migrate/cckfield/d6/FileField.php @@ -4,7 +4,7 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Row; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -12,7 +12,7 @@ * core = {6} * ) */ -class FileField extends CckFieldPluginBase { +class FileField extends FieldPluginBase { /** * {@inheritdoc} @@ -42,7 +42,7 @@ public function getFieldFormatterMap() { */ public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) { $process = [ - 'plugin' => 'd6_cck_file', + 'plugin' => 'd6_field_file', 'source' => $field_name, ]; $migration->mergeProcessOfProperty($field_name, $process); diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php index d0b1335..3fa9b67 100644 --- a/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php +++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/FileField.php @@ -4,7 +4,7 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Row; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -12,7 +12,7 @@ * core = {7} * ) */ -class FileField extends CckFieldPluginBase { +class FileField extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php index 7f47caa..ab1af92 100644 --- a/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php +++ b/core/modules/file/src/Plugin/migrate/cckfield/d7/ImageField.php @@ -3,7 +3,7 @@ namespace Drupal\file\Plugin\migrate\cckfield\d7; use Drupal\migrate\Plugin\MigrationInterface; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -11,7 +11,7 @@ * core = {7} * ) */ -class ImageField extends CckFieldPluginBase { +class ImageField extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php index 0415c7f..fd9e10f 100644 --- a/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php +++ b/core/modules/file/src/Plugin/migrate/process/d6/CckFile.php @@ -13,7 +13,7 @@ /** * @MigrateProcessPlugin( - * id = "d6_cck_file" + * id = "d6_field_file" * ) */ class CckFile extends ProcessPluginBase implements ContainerFactoryPluginInterface { diff --git a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php b/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php index 1ee73a8..8cc8d8b 100644 --- a/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php +++ b/core/modules/file/tests/src/Unit/Plugin/migrate/process/d6/CckFileTest.php @@ -25,7 +25,7 @@ public function testTransformAltTitle() { $migration_plugin = $this->prophesize(MigrateProcessInterface::class); $migration_plugin->transform(1, $executable, $row, 'foo')->willReturn(1); - $plugin = new CckFile(array(), 'd6_cck_file', array(), $migration, $migration_plugin->reveal()); + $plugin = new CckFile(array(), 'd6_field_file', array(), $migration, $migration_plugin->reveal()); $options = array( 'alt' => 'Foobaz', diff --git a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php index 314e8df..3c77e38 100644 --- a/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php +++ b/core/modules/link/src/Plugin/migrate/cckfield/LinkField.php @@ -3,7 +3,7 @@ namespace Drupal\link\Plugin\migrate\cckfield; use Drupal\migrate\Plugin\MigrationInterface; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -14,13 +14,13 @@ * } * ) */ -class LinkField extends CckFieldPluginBase { +class LinkField extends FieldPluginBase { /** * {@inheritdoc} */ public function getFieldFormatterMap() { - // See d6_field_formatter_settings.yml and CckFieldPluginBase + // See d6_field_formatter_settings.yml and FieldPluginBase // processFieldFormatter(). return [ 'default' => 'link', @@ -39,7 +39,7 @@ public function getFieldFormatterMap() { */ public function processCckFieldValues(MigrationInterface $migration, $field_name, $data) { $process = [ - 'plugin' => 'd6_cck_link', + 'plugin' => 'd6_field_link', 'source' => $field_name, ]; $migration->mergeProcessOfProperty($field_name, $process); diff --git a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php index 2c03412..457da13 100644 --- a/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php +++ b/core/modules/link/src/Plugin/migrate/process/d6/CckLink.php @@ -11,7 +11,7 @@ /** * @MigrateProcessPlugin( - * id = "d6_cck_link" + * id = "d6_field_link" * ) */ class CckLink extends ProcessPluginBase implements ContainerFactoryPluginInterface { diff --git a/core/modules/migrate_drupal/migrate_drupal.services.yml b/core/modules/migrate_drupal/migrate_drupal.services.yml index 71a0b27..5849e51 100644 --- a/core/modules/migrate_drupal/migrate_drupal.services.yml +++ b/core/modules/migrate_drupal/migrate_drupal.services.yml @@ -1,6 +1,6 @@ services: - plugin.manager.migrate.cckfield: - class: Drupal\migrate_drupal\Plugin\MigrateCckFieldPluginManager + plugin.manager.migrate.field: + class: Drupal\migrate_drupal\Plugin\MigrateFieldPluginManager arguments: - cckfield - '@container.namespaces' diff --git a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php index 56c7b5b..401a593 100644 --- a/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php +++ b/core/modules/migrate_drupal/src/Plugin/MigrateCckFieldPluginManager.php @@ -15,7 +15,7 @@ * * @ingroup migration */ -class MigrateCckFieldPluginManager extends MigratePluginManager implements MigrateCckFieldPluginManagerInterface { +class MigrateFieldPluginManager extends MigratePluginManager implements MigrateCckFieldPluginManagerInterface { /** * The default version of core to use for cck field plugins. diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php index 017b7e7..33566f8 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/CckMigration.php @@ -16,7 +16,7 @@ /** * Migration plugin class for migrations dealing with CCK field values. */ -class CckMigration extends Migration implements ContainerFactoryPluginInterface { +class FieldMigration extends Migration implements ContainerFactoryPluginInterface { /** * Flag indicating whether the CCK data has been filled already. @@ -47,7 +47,7 @@ class CckMigration extends Migration implements ContainerFactoryPluginInterface protected $cckPluginManager; /** - * Constructs a CckMigration. + * Constructs a FieldMigration. * * @param array $configuration * Plugin configuration. @@ -81,7 +81,7 @@ public static function create(ContainerInterface $container, array $configuratio $configuration, $plugin_id, $plugin_definition, - $container->get('plugin.manager.migrate.cckfield'), + $container->get('plugin.manager.migrate.field'), $container->get('plugin.manager.migration'), $container->get('plugin.manager.migrate.source'), $container->get('plugin.manager.migrate.process'), 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 d942bce..a047695 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/cckfield/CckFieldPluginBase.php @@ -17,7 +17,7 @@ * * @ingroup migration */ -abstract class CckFieldPluginBase extends PluginBase implements MigrateCckFieldInterface { +abstract class FieldPluginBase extends PluginBase implements MigrateCckFieldInterface { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php index 529907a..2c53d98 100644 --- a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php +++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6FileField.php @@ -2,7 +2,7 @@ namespace Drupal\migrate_cckfield_plugin_manager_test\Plugin\migrate\cckfield; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; use Drupal\migrate\Plugin\MigrationInterface; /** @@ -14,7 +14,7 @@ * } * ) */ -class D6FileField extends CckFieldPluginBase { +class D6FileField extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php index 16967db..b2efb88 100644 --- a/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php +++ b/core/modules/migrate_drupal/tests/modules/migrate_cckfield_plugin_manager_test/src/Plugin/migrate/cckfield/D6NoCoreVersionSpecified.php @@ -2,7 +2,7 @@ namespace Drupal\migrate_cckfield_plugin_manager_test\Plugin\migrate\cckfield; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; use Drupal\migrate\Plugin\MigrationInterface; /** @@ -10,7 +10,7 @@ * id = "d6_no_core_version_specified" * ) */ -class D6NoCoreVersionSpecified extends CckFieldPluginBase { +class D6NoCoreVersionSpecified extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php b/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php index 1754cfe..580cd0d 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/MigrateCckFieldPluginManagerTest.php @@ -20,7 +20,7 @@ class MigrateCckFieldPluginManagerTest extends MigrateDrupalTestBase { * Tests that the correct MigrateCckField plugins are used. */ public function testPluginSelection() { - $plugin_manager = \Drupal::service('plugin.manager.migrate.cckfield'); + $plugin_manager = \Drupal::service('plugin.manager.migrate.field'); $plugin_id = $plugin_manager->getPluginIdFromFieldType('filefield', ['core' => 6]); $this->assertIdentical('Drupal\\file\\Plugin\\migrate\\cckfield\\d6\\FileField', get_class($plugin_manager->createInstance($plugin_id, ['core' => 6]))); diff --git a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php index 3fba70a..6bfe978 100644 --- a/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php +++ b/core/modules/node/src/Plugin/migrate/D6NodeDeriver.php @@ -68,7 +68,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) { // Translations don't make sense unless we have content_translation. return new static( $base_plugin_id, - $container->get('plugin.manager.migrate.cckfield'), + $container->get('plugin.manager.migrate.field'), $container->get('module_handler')->moduleExists('content_translation') ); } diff --git a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php index bd3d8b9..651bf0f 100644 --- a/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php +++ b/core/modules/node/src/Plugin/migrate/D7NodeDeriver.php @@ -57,7 +57,7 @@ public function __construct($base_plugin_id, MigrateCckFieldPluginManagerInterfa public static function create(ContainerInterface $container, $base_plugin_id) { return new static( $base_plugin_id, - $container->get('plugin.manager.migrate.cckfield') + $container->get('plugin.manager.migrate.field') ); } diff --git a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php index c3035c4..337824d 100644 --- a/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php +++ b/core/modules/taxonomy/src/Plugin/migrate/cckfield/TaxonomyTermReference.php @@ -3,7 +3,7 @@ namespace Drupal\taxonomy\Plugin\migrate\cckfield; use Drupal\migrate\Plugin\MigrationInterface; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -14,7 +14,7 @@ * core = {6,7} * ) */ -class TaxonomyTermReference extends CckFieldPluginBase { +class TaxonomyTermReference extends FieldPluginBase { /** * {@inheritdoc} diff --git a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php index 89475ff..7e9a911 100644 --- a/core/modules/text/src/Plugin/migrate/cckfield/TextField.php +++ b/core/modules/text/src/Plugin/migrate/cckfield/TextField.php @@ -4,7 +4,7 @@ use Drupal\migrate\Plugin\MigrationInterface; use Drupal\migrate\Row; -use Drupal\migrate_drupal\Plugin\migrate\cckfield\CckFieldPluginBase; +use Drupal\migrate_drupal\Plugin\migrate\cckfield\FieldPluginBase; /** * @MigrateCckField( @@ -17,7 +17,7 @@ * core = {6,7} * ) */ -class TextField extends CckFieldPluginBase { +class TextField extends FieldPluginBase { /** * {@inheritdoc}