diff --git a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php index 1d6dd82..0634169 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php +++ b/core/modules/migrate/lib/Drupal/migrate/Entity/Migration.php @@ -42,15 +42,6 @@ class Migration extends ConfigEntityBase implements MigrationInterface, Requirem public $id; /** - * The migration UUID. - * - * This is assigned automatically when the migration is created. - * - * @var string - */ - public $uuid; - - /** * The human-readable label for the migration. * * @var string diff --git a/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php b/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php index 689af20..dcb84d2 100644 --- a/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php +++ b/core/modules/migrate/lib/Drupal/migrate/MigrateExecutable.php @@ -7,7 +7,6 @@ namespace Drupal\migrate; -use Drupal\Component\Utility\String; use Drupal\Core\Utility\Error; use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntity.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntity.php index df2c142..64816ec 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntity.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntity.php @@ -48,7 +48,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) { /** * {@inheritdoc} */ - public function getDerivativeDefinition($derivative_id, array $base_plugin_definition) { + public function getDerivativeDefinition($derivative_id, $base_plugin_definition) { if (!empty($this->derivatives) && !empty($this->derivatives[$derivative_id])) { return $this->derivatives[$derivative_id]; } @@ -59,7 +59,7 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin /** * {@inheritdoc} */ - public function getDerivativeDefinitions(array $base_plugin_definition) { + public function getDerivativeDefinitions($base_plugin_definition) { foreach ($this->entityDefinitions as $entity_type => $entity_info) { $class = is_subclass_of($entity_info->getClass(), 'Drupal\Core\Config\Entity\ConfigEntityInterface') ? 'Drupal\migrate\Plugin\migrate\destination\EntityConfigBase' : diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntityRevision.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntityRevision.php index ae6395d..922bedd 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntityRevision.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/Derivative/MigrateEntityRevision.php @@ -48,7 +48,7 @@ public static function create(ContainerInterface $container, $base_plugin_id) { /** * {@inheritdoc} */ - public function getDerivativeDefinition($derivative_id, array $base_plugin_definition) { + public function getDerivativeDefinition($derivative_id, $base_plugin_definition) { if (!empty($this->derivatives) && !empty($this->derivatives[$derivative_id])) { return $this->derivatives[$derivative_id]; } @@ -59,7 +59,7 @@ public function getDerivativeDefinition($derivative_id, array $base_plugin_defin /** * {@inheritdoc} */ - public function getDerivativeDefinitions(array $base_plugin_definition) { + public function getDerivativeDefinitions($base_plugin_definition) { foreach ($this->entityDefinitions as $entity_type => $entity_info) { if ($entity_info->getKey('revision')) { $this->derivatives[$entity_type] = array( diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateDestinationPluginManager.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateDestinationPluginManager.php index d4d581b..9e87795 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateDestinationPluginManager.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/MigrateDestinationPluginManager.php @@ -13,6 +13,7 @@ use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Extension\ThemeHandlerInterface; use Drupal\Core\Language\LanguageManager; +use Drupal\migrate\Entity\MigrationInterface; class MigrateDestinationPluginManager extends MigratePluginManager { @@ -33,35 +34,21 @@ class MigrateDestinationPluginManager extends MigratePluginManager { /** * {@inheritdoc} */ - public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler, ThemeHandlerInterface $theme_handler, EntityManagerInterface $entity_manager, $annotation = 'Drupal\migrate\Annotation\MigrateDestination') { + public function __construct($type, \Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ModuleHandlerInterface $module_handler, EntityManagerInterface $entity_manager, $annotation = 'Drupal\migrate\Annotation\MigrateDestination') { parent::__construct($type, $namespaces, $cache_backend, $language_manager, $module_handler, $annotation); - $this->themeHandler = $theme_handler; $this->entityManager = $entity_manager; } /** * {@inheritdoc} + * + * A specific createInstance method is necessary to pass the migration on. */ - public function processDefinition(&$definition, $plugin_id) { - // By setting requirements_met to something in the annotation, this - // handling can be skipped. - parent::processDefinition($definition, $plugin_id); - if ($definition['requirements_met'] === TRUE) { - if (substr($plugin_id, 0, 7) == 'entity:' && !$this->entityManager->getDefinition(substr($plugin_id, 7))) { - $definition['requirements_met'] = FALSE; - } - elseif (isset($definition['destination_provider'])) { - if (!isset($this->providers)) { - $this->providers = $this->moduleHandler->getModuleList(); - foreach ($this->themeHandler->listInfo() as $theme => $info) { - if ($info->status) { - $this->providers[$theme] = TRUE; - } - } - } - $definition['requirements_met'] = isset($this->providers[$definition['destination_provider']]); - } + public function createInstance($plugin_id, array $configuration = array(), MigrationInterface $migration = NULL) { + if (substr($plugin_id, 0, 7) == 'entity:' && !$this->entityManager->getDefinition(substr($plugin_id, 7), FALSE)) { + $plugin_id = 'null'; } + return parent::createInstance($plugin_id, $configuration, $migration); } } diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Config.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Config.php index 7f69b31..e74027a 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Config.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Config.php @@ -16,6 +16,9 @@ /** * Persist data to the config system. * + * When a property is NULL, the default is used unless the configuration option + * 'store null' is set to TRUE. + * * @MigrateDestination( * id = "config" * ) @@ -66,7 +69,9 @@ public static function create(ContainerInterface $container, array $configuratio */ public function import(Row $row, array $old_destination_id_values = array()) { foreach ($row->getRawDestination() as $key => $value) { - $this->config->set($key, $value); + if (isset($value) || !empty($this->configuration['store null'])) { + $this->config->set($key, $value); + } } $this->config->save(); return TRUE; diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php index c9df406..e82f730 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Entity.php @@ -61,14 +61,14 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration = NULL) { - $entity_type = static::getEntityType($plugin_id); + $entity_type_id = static::getEntityTypeId($plugin_id); return new static( $configuration, $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController($entity_type), - array_keys($container->get('entity.manager')->getBundleInfo($entity_type)) + $container->get('entity.manager')->getStorageController($entity_type_id), + array_keys($container->get('entity.manager')->getBundleInfo($entity_type_id)) ); } @@ -82,8 +82,8 @@ public static function create(ContainerInterface $container, array $configuratio * The entity type. * @throws \Drupal\migrate\MigrateException */ - protected static function getEntityType($plugin_id) { - // Remove entity. + protected static function getEntityTypeId($plugin_id) { + // Remove "entity:" return substr($plugin_id, 7); } diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php index 36601d9..cf3faba 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityComment.php @@ -60,7 +60,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration = NULL) { - $entity_type = static::getEntityType($plugin_id); + $entity_type = static::getEntityTypeId($plugin_id); return new static( $configuration, $plugin_id, diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityConfigBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityConfigBase.php index 3713678..e788939 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityConfigBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityConfigBase.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\NestedArray; use Drupal\Core\Entity\EntityInterface; +use Drupal\migrate\MigrateException; use Drupal\migrate\Row; /** @@ -27,6 +28,9 @@ class EntityConfigBase extends Entity { * {@inheritdoc} */ public function import(Row $row, array $old_destination_id_values = array()) { + if ($row->stub()) { + throw new MigrateException('Config entities can not be stubbed.'); + } $ids = $this->getIds(); $id_key = $this->getKey('id'); if (count($ids) > 1) { diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php index 63e6ca8..70f2624 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityContentBase.php @@ -57,7 +57,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration = NULL) { - $entity_type = static::getEntityType($plugin_id); + $entity_type = static::getEntityTypeId($plugin_id); return new static( $configuration, $plugin_id, diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityRevision.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityRevision.php index 1efef0f..5476def 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityRevision.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityRevision.php @@ -22,7 +22,7 @@ class EntityRevision extends EntityContentBase { /** * {@inheritdoc} */ - protected static function getEntityType($plugin_id) { + protected static function getEntityTypeId($plugin_id) { // Remove entity_revision: return substr($plugin_id, 16); } diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php index 3b3c5b1..d218b4b 100644 --- a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/EntityUser.php @@ -64,7 +64,7 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration = NULL) { - $entity_type = static::getEntityType($plugin_id); + $entity_type = static::getEntityTypeId($plugin_id); return new static( $configuration, $plugin_id, diff --git a/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Null.php b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Null.php new file mode 100644 index 0000000..d5e6ba2 --- /dev/null +++ b/core/modules/migrate/lib/Drupal/migrate/Plugin/migrate/destination/Null.php @@ -0,0 +1,41 @@ +stub(TRUE); // Do a normal migration with the stub row. $migrate_executable->processRow($stub_row, $process); - $destination_ids = $destination_plugin->import($stub_row); + $destination_ids = array(); + try { + $destination_ids = $destination_plugin->import($stub_row); + } + catch (MigrateException $e) { + } } - if ($scalar) { - if (count($destination_ids) == 1) { - return reset($destination_ids); + if ($destination_ids) { + if ($scalar) { + if (count($destination_ids) == 1) { + return reset($destination_ids); + } + } + else { + return $destination_ids; } - throw new MigrateException('Migration process plugin failed.'); } - return $destination_ids; + throw new MigrateSkipRowException(); } } diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml index 8b9c0cd..4112da5 100644 --- a/core/modules/migrate/migrate.services.yml +++ b/core/modules/migrate/migrate.services.yml @@ -14,7 +14,7 @@ services: arguments: [process, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', 'Drupal\migrate\Annotation\MigrateProcessPlugin'] plugin.manager.migrate.destination: class: Drupal\migrate\Plugin\MigrateDestinationPluginManager - arguments: [destination, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', '@theme_handler', '@entity.manager'] + arguments: [destination, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler', '@entity.manager'] plugin.manager.migrate.id_map: class: Drupal\migrate\Plugin\MigratePluginManager arguments: [id_map, '@container.namespaces', '@cache.cache', '@language_manager', '@module_handler'] diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_field.yml index 59f28e9..f0e4cf5 100644 --- a/core/modules/migrate_drupal/config/migrate.migration.d6_field.yml +++ b/core/modules/migrate_drupal/config/migrate.migration.d6_field.yml @@ -4,7 +4,7 @@ source: plugin: d6_field constants: entity_type: node - langocde: und + langcode: und process: entity_type: constants.entity_type status: active diff --git a/core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml index 4752224..78caf05 100644 --- a/core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml +++ b/core/modules/migrate_drupal/config/migrate.migration.d6_taxonomy_settings.yml @@ -6,15 +6,7 @@ source: - taxonomy_terms_per_page_admin process: override_selector: taxonomy_override_selector - # this settings requires a default because it's not inserted into the d6 - # database anywhere. - terms_per_page_admin: - - - plugin: get - source: taxonomy_terms_per_page_admin - - - plugin: default_value - default_value: 100 + terms_per_page_admin: taxonomy_terms_per_page_admin destination: plugin: config config_name: taxonomy.settings diff --git a/core/modules/migrate_drupal/config/migrate.migration.d7_tracker_settings.yml b/core/modules/migrate_drupal/config/migrate.migration.d7_tracker_settings.yml deleted file mode 100644 index 3c355e7..0000000 --- a/core/modules/migrate_drupal/config/migrate.migration.d7_tracker_settings.yml +++ /dev/null @@ -1,10 +0,0 @@ -id: d7_tracker_settings -source: - plugin: variable - variables: - - cron_index_limit -process: - cron_index_limit: cron_index_limit -destination: - plugin: config - config_name: tracker.settings diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockPluginId.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockPluginId.php index e571819..bfe76cc 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockPluginId.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Plugin/migrate/process/d6/BlockPluginId.php @@ -11,6 +11,7 @@ use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\migrate\Entity\MigrationInterface; use Drupal\migrate\MigrateExecutable; +use Drupal\migrate\MigrateSkipRowException; use Drupal\migrate\Plugin\MigratePluginManager; use Drupal\migrate\ProcessPluginBase; use Drupal\migrate\Row; @@ -47,12 +48,13 @@ public function __construct(array $configuration, $plugin_id, array $plugin_defi * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, array $plugin_definition, MigrationInterface $migration = NULL) { + $entity_manager = $container->get('entity.manager'); return new static( $configuration, $plugin_id, $plugin_definition, $migration, - $container->get('entity.manager')->getStorageController('custom_block'), + $entity_manager->getDefinition('custom_block') ? $entity_manager->getStorageController('custom_block') : NULL, $container->get('plugin.manager.migrate.process') ); } @@ -78,14 +80,18 @@ public function transform($value, MigrateExecutable $migrate_executable, Row $ro $value = "system_menu_block:$delta"; break; case 'block': - $block_ids = $this->processPluginManager - ->createInstance('migration', array('migration' => 'd6_custom_block'), $this->migration) - ->transform($delta, $migrate_executable, $row, $destination_property); - $value = 'custom_block:' . $this->customBlockStorageController->load($block_ids[0])->uuid(); + if ($this->customBlockStorageController) { + $block_ids = $this->processPluginManager + ->createInstance('migration', array('migration' => 'd6_custom_block'), $this->migration) + ->transform($delta, $migrate_executable, $row, $destination_property); + $value = 'custom_block:' . $this->customBlockStorageController->load($block_ids[0])->uuid(); + } + else { + throw new MigrateSkipRowException(); + } break; default: - // @TODO skip row. - // throw new MigrateSkipRowException(); + throw new MigrateSkipRowException(); } } return $value; diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6StatisticsSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6StatisticsSettings.php index 1bec9c6..071b44a 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6StatisticsSettings.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal6StatisticsSettings.php @@ -30,7 +30,7 @@ public function load() { 'value' => 'i:259200;', )) ->values(array( - 'name' => 'statistics_count_content_view', + 'name' => 'statistics_count_content_views', 'value' => 'i:0;', )) ->values(array( diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal7TrackerSettings.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal7TrackerSettings.php deleted file mode 100644 index b82c025..0000000 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/Dump/Drupal7TrackerSettings.php +++ /dev/null @@ -1,30 +0,0 @@ -createTable('variable'); - $this->database->insert('variable')->fields(array( - 'name', - 'value', - )) - ->values(array( - 'name' => 'cron_index_limit', - 'value' => "i:1000;", - )) - ->execute(); - } -} diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSimpletestConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSimpletestConfigsTest.php index ab58367..24115e3 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSimpletestConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSimpletestConfigsTest.php @@ -55,8 +55,10 @@ public function testSimpletestSettings() { $config = \Drupal::config('simpletest.settings'); $this->assertIdentical($config->get('clear_results'), TRUE); $this->assertIdentical($config->get('httpauth.method'), CURLAUTH_BASIC); - $this->assertIdentical($config->get('httpauth.password'), NULL); - $this->assertIdentical($config->get('httpauth.username'), NULL); + // NULL in the dump means defaults which is empty string. Same as omitting + // them. + $this->assertIdentical($config->get('httpauth.password'), ''); + $this->assertIdentical($config->get('httpauth.username'), ''); $this->assertIdentical($config->get('verbose'), TRUE); } } diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateStatisticsConfigsTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateStatisticsConfigsTest.php index c1c9e7d..36c47d2 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateStatisticsConfigsTest.php @@ -55,7 +55,7 @@ public function testStatisticsSettings() { $config = \Drupal::config('statistics.settings'); $this->assertIdentical($config->get('access_log.enable'), 0); $this->assertIdentical($config->get('access_log.max_lifetime'), 259200); - $this->assertIdentical($config->get('count_content_views'), NULL); + $this->assertIdentical($config->get('count_content_views'), 0); $this->assertIdentical($config->get('block.popular.top_day_limit'), 0); $this->assertIdentical($config->get('block.popular.top_all_limit'), 0); $this->assertIdentical($config->get('block.popular.top_recent_limit'), 0); diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemCronTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemCronTest.php index e2c6a32..e159c8a 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemCronTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemCronTest.php @@ -11,6 +11,9 @@ use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +/** + * Tests the Drupal 6 cron variables to Drupal 8 system.cron config migration. + */ class MigrateSystemCronTest extends MigrateDrupalTestBase { /** diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemFilterTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemFilterTest.php index 1872fe3..418e0c8 100644 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemFilterTest.php +++ b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d6/MigrateSystemFilterTest.php @@ -11,6 +11,9 @@ use Drupal\migrate\MigrateExecutable; use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase; +/** + * Tests the Drupal 6 system filter variables to Drupal 8 system.filter config migration. + */ class MigrateSystemFilterTest extends MigrateDrupalTestBase { /** diff --git a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d7/MigrateTrackerConfigTest.php b/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d7/MigrateTrackerConfigTest.php deleted file mode 100644 index 537a7df..0000000 --- a/core/modules/migrate_drupal/lib/Drupal/migrate_drupal/Tests/d7/MigrateTrackerConfigTest.php +++ /dev/null @@ -1,52 +0,0 @@ - 'Migrate variables to tracker.*.yml', - 'description' => 'Upgrade variables to tracker.*.yml', - 'group' => 'Migrate Drupal', - ); - } - - /** - * Tests migration of tracker settings variables to tracker.settings.yml. - */ - public function testTrackerSettings() { - $migration = entity_load('migration', 'd7_tracker_settings'); - $dumps = array( - drupal_get_path('module', 'migrate_drupal') . '/lib/Drupal/migrate_drupal/Tests/Dump/Drupal7TrackerSettings.php', - ); - $this->prepare($migration, $dumps); - $executable = new MigrateExecutable($migration, $this); - $executable->import(); - $config = \Drupal::config('tracker.settings'); - $this->assertIdentical($config->get('cron_index_limit'), 1000); - } - -} diff --git a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableTest.php b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableTest.php index e23f02c..b5da66b 100644 --- a/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableTest.php +++ b/core/modules/migrate_drupal/tests/Drupal/migrate_drupal/Tests/source/VariableTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate\Tests\source\VariableTest. + * Contains \Drupal\migrate_drupal\Tests\source\VariableTest. */ -namespace Drupal\migrate_drupal\Tests\source\d6; +namespace Drupal\migrate_drupal\Tests\source; use Drupal\migrate\Tests\MigrateSqlSourceTestCase; @@ -49,8 +49,8 @@ class VariableTest extends MigrateSqlSourceTestCase { */ public static function getInfo() { return array( - 'name' => 'D6 variable source functionality', - 'description' => 'Tests D6 variable source plugin.', + 'name' => 'Variable source functionality', + 'description' => 'Tests variable source plugin.', 'group' => 'Migrate Drupal', ); }