Issue #2533986 by phenaproxima: Move module-specific migration support into the block module

core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockPluginId.php → 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;

core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockRegion.php → core/modules/block/src/Plugin/migrate/process/d6/BlockRegion.php

 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockRegion.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockRegion.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
-use Drupal\Component\Utility\NestedArray;
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;
 use Drupal\migrate\Row;

core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockSettings.php → core/modules/block/src/Plugin/migrate/process/d6/BlockSettings.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockSettings.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockSettings.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\MigrateExecutableInterface;
 use Drupal\migrate\ProcessPluginBase;

core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockTheme.php → core/modules/block/src/Plugin/migrate/process/d6/BlockTheme.php

 <?php
+
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockTheme.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockTheme.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\migrate\Entity\MigrationInterface;
 use Drupal\migrate\MigrateExecutableInterface;

core/modules/migrate_drupal/src/Plugin/migrate/process/d6/BlockVisibility.php → core/modules/block/src/Plugin/migrate/process/d6/BlockVisibility.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\BlockVisibility.
+ * Contains \Drupal\block\Plugin\migrate\process\d6\BlockVisibility.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\process\d6;
+namespace Drupal\block\Plugin\migrate\process\d6;
 
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\migrate\MigrateExecutableInterface;

core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Block.php → core/modules/block/src/Plugin/migrate/source/d6/Block.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Block.
+ * Contains \Drupal\block\Plugin\migrate\source\d6\Block.
  */
 
-namespace Drupal\migrate_drupal\Plugin\migrate\source\d6;
+namespace Drupal\block\Plugin\migrate\source\d6;
 
 use Drupal\migrate\Row;
 use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;

core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php → core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php

@@ -2,17 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\migrate_drupal\Tests\d6\MigrateBlockTest.
+ * Contains \Drupal\block\Tests\Migrate\d6\MigrateBlockTest.
  */
 
-namespace Drupal\migrate_drupal\Tests\d6;
+namespace Drupal\block\Tests\Migrate\d6;
 
 use Drupal\block\Entity\Block;
+use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
  * Upgrade block settings to block.block.*.yml.
  *
- * @group migrate_drupal
+ * @group block
  */
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 

core/modules/migrate_drupal/tests/src/Unit/source/d6/BlockTest.php → core/modules/block/tests/src/Unit/Plugin/migrate/source/d6/BlockTest.php

@@ -2,23 +2,24 @@
 
 /**
  * @file
- * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\BlockTest.
+ * Contains \Drupal\Tests\block\Unit\Plugin\migrate\source\d6\BlockTest.
  */
 
-namespace Drupal\Tests\migrate_drupal\Unit\source\d6;
+namespace Drupal\Tests\block\Unit\Plugin\migrate\source\d6;
 
 use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
 
 /**
  * Tests D6 block source plugin.
  *
- * @group migrate_drupal
+ * @coversDefaultClass \Drupal\block\Plugin\migrate\source\d6\Block
+ * @group block
  */
 class BlockTest extends MigrateSqlSourceTestCase {
 
   // The plugin system is not working during unit testing so the source plugin
   // class needs to be manually specified.
-  const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Block';
+  const PLUGIN_CLASS = 'Drupal\block\Plugin\migrate\source\d6\Block';
 
   // The fake Migration configuration entity.
   protected $migrationConfiguration = array(