Commit 5d183c78 authored by alexpott's avatar alexpott

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

parent 4104c3ff
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
/** /**
* @file * @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\Entity\EntityStorageInterface;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
......
<?php <?php
/** /**
* @file * @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\MigrateExecutableInterface;
use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\ProcessPluginBase;
use Drupal\migrate\Row; use Drupal\migrate\Row;
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
/** /**
* @file * @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\MigrateExecutableInterface;
use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\ProcessPluginBase;
......
<?php <?php
/** /**
* @file * @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\Entity\MigrationInterface;
use Drupal\migrate\MigrateExecutableInterface; use Drupal\migrate\MigrateExecutableInterface;
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
/** /**
* @file * @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\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\migrate\MigrateExecutableInterface; use Drupal\migrate\MigrateExecutableInterface;
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
/** /**
* @file * @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\Row;
use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase;
......
...@@ -2,17 +2,18 @@ ...@@ -2,17 +2,18 @@
/** /**
* @file * @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\block\Entity\Block;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/** /**
* Upgrade block settings to block.block.*.yml. * Upgrade block settings to block.block.*.yml.
* *
* @group migrate_drupal * @group block
*/ */
class MigrateBlockTest extends MigrateDrupal6TestBase { class MigrateBlockTest extends MigrateDrupal6TestBase {
......
...@@ -2,23 +2,24 @@ ...@@ -2,23 +2,24 @@
/** /**
* @file * @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; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase;
/** /**
* Tests D6 block source plugin. * Tests D6 block source plugin.
* *
* @group migrate_drupal * @coversDefaultClass \Drupal\block\Plugin\migrate\source\d6\Block
* @group block
*/ */
class BlockTest extends MigrateSqlSourceTestCase { class BlockTest extends MigrateSqlSourceTestCase {
// The plugin system is not working during unit testing so the source plugin // The plugin system is not working during unit testing so the source plugin
// class needs to be manually specified. // 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. // The fake Migration configuration entity.
protected $migrationConfiguration = array( protected $migrationConfiguration = array(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment