diff --git a/core/modules/migrate_drupal/migration_templates/d6_block.yml b/core/modules/block/migration_templates/d6_block.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_block.yml rename to core/modules/block/migration_templates/d6_block.yml diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php similarity index 95% rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php rename to core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php index 01854bd90686b572de2c183bbbd0b761b285665d..55cbd9686230d0b4b316dbbe8fa712c15a7d1734 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php +++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockPluginId.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockPluginId. + * Contains \Drupal\block\Plugin\migrate\process\d6\BlockPluginId. */ -namespace Drupal\migrate_drupal\Plugin\migrate\process\d6; +namespace Drupal\block\Plugin\migrate\process\d6; use Drupal\Core\Entity\EntityStorageInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php similarity index 86% rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php rename to core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php index 0f61515e50b00b132c9fe5b0ac7a55583caa4d09..672645b3d4623f898b60bf4e1777f703b4cb4656 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php +++ b/core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php @@ -1,12 +1,12 @@