diff --git a/core/modules/migrate/migrate.services.yml b/core/modules/migrate/migrate.services.yml
index 3f2d32d56e7228a81d4bb28868d2ef41f9a1cdd2..41c52ffa7b2f91cbabb1ed1808356b43e3cee40b 100644
--- a/core/modules/migrate/migrate.services.yml
+++ b/core/modules/migrate/migrate.services.yml
@@ -5,6 +5,9 @@ services:
- { name: cache.bin }
factory: cache_factory:get
arguments: [migrate]
+ migrate.template_storage:
+ class: Drupal\migrate\MigrateTemplateStorage
+ arguments: ['@config.storage']
plugin.manager.migrate.source:
class: Drupal\migrate\Plugin\MigratePluginManager
arguments: [source, '@container.namespaces', '@cache.discovery', '@module_handler', 'Drupal\migrate\Annotation\MigrateSource']
diff --git a/core/modules/migrate/src/MigrateTemplateStorage.php b/core/modules/migrate/src/MigrateTemplateStorage.php
new file mode 100644
index 0000000000000000000000000000000000000000..6a62fa901aee49d4182bca0422eba812129fd6a2
--- /dev/null
+++ b/core/modules/migrate/src/MigrateTemplateStorage.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\MigrateTemplateStorage.
+ */
+
+namespace Drupal\migrate;
+
+use Drupal\Component\Discovery\YamlDiscovery;
+use Drupal\Core\Config\ExtensionInstallStorage;
+use Drupal\Core\Config\StorageInterface;
+
+/**
+ * Storage to access migration template configuration in enabled extensions.
+ */
+class MigrateTemplateStorage extends ExtensionInstallStorage {
+
+ /**
+ * Extension sub-directory containing default configuration for migrations.
+ */
+ const MIGRATION_TEMPLATE_DIRECTORY = 'migration_templates';
+
+ /**
+ * {@inheritdoc}
+ */
+ public function __construct(StorageInterface $config_storage, $directory = self::MIGRATION_TEMPLATE_DIRECTORY, $collection = StorageInterface::DEFAULT_COLLECTION, $include_profile = TRUE) {
+ parent::__construct($config_storage, $directory, $collection, $include_profile);
+ }
+
+ /**
+ * Find all migration templates with the specified tag.
+ *
+ * @param $tag
+ * The tag to match.
+ *
+ * @return array
+ * Any templates (parsed YAML config) that matched, keyed by the ID.
+ */
+ public function findTemplatesByTag($tag) {
+ $templates = $this->getAllTemplates();
+ $matched_templates = [];
+ foreach ($templates as $template_name => $template) {
+ if (!empty($template['migration_tags'])) {
+ if (in_array($tag, $template['migration_tags'])) {
+ $matched_templates[$template_name] = $template;
+ }
+ }
+ }
+ return $matched_templates;
+ }
+
+ /**
+ * Retrieves all migration templates belonging to enabled extensions.
+ *
+ * @return array
+ * Array of parsed templates, keyed by the fully-qualified id.
+ */
+ public function getAllTemplates() {
+ // Retrieve the full list of templates, keyed by fully-qualified name,
+ // with the containing folder as the value.
+ $folders = $this->getAllFolders();
+ $templates = [];
+ foreach ($folders as $full_name => $folder) {
+ // The fully qualified name will be in the form migrate.migration.d6_node.
+ // Break out the provider ('migrate') and name ('migration.d6_node').
+ list($provider, $name) = explode('.', $full_name, 2);
+ // Retrieve and parse the template contents.
+ $discovery = new YamlDiscovery($name, array($provider => $folder));
+ $all = $discovery->findAll();
+ $templates[$full_name] = reset($all);
+ }
+
+ return $templates;
+ }
+
+}
diff --git a/core/modules/migrate/src/Tests/TemplateTest.php b/core/modules/migrate/src/Tests/TemplateTest.php
new file mode 100644
index 0000000000000000000000000000000000000000..b110f6cb6949730a660782958acc4e7897a3229f
--- /dev/null
+++ b/core/modules/migrate/src/Tests/TemplateTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\migrate\Tests\TemplateTest
+ */
+
+namespace Drupal\migrate\Tests;
+
+use Drupal\migrate\MigrationStorage;
+
+/**
+ * Test the migration template functionality.
+ *
+ * @group migrate
+ */
+class TemplateTest extends MigrateTestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ public static $modules = array('template_test');
+
+ /**
+ * Test different connection types.
+ */
+ public function testTemplates() {
+ $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test");
+ $expected_url = [
+ 'id' => 'url_template',
+ 'label' => 'Template test - url',
+ 'migration_tags' => ['Template Test'],
+ 'source' => ['plugin' => 'empty'],
+ 'process' => ['src' => 'foobar'],
+ 'destination' => ['plugin' => 'url_alias'],
+ ];
+ $expected_node = [
+ 'id' => 'node_template',
+ 'label' => 'Template test - node',
+ 'migration_tags' => ['Template Test'],
+ 'source' => ['plugin' => 'empty'],
+ 'process' => ['src' => 'barfoo'],
+ 'destination' => ['plugin' => 'entity:node'],
+ ];
+ $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url);
+ $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node);
+ $this->assertFalse(isset($migration_templates['migrate.migration.other_template']));
+ }
+
+}
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
new file mode 100644
index 0000000000000000000000000000000000000000..6eead8b7019309741d7878d0b4a0bb37eb6669b1
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.node_template.yml
@@ -0,0 +1,10 @@
+id: node_template
+label: Template test - node
+migration_tags:
+ - Template Test
+source:
+ plugin: empty
+process:
+ src: barfoo
+destination:
+ plugin: entity:node
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
new file mode 100644
index 0000000000000000000000000000000000000000..3d974f007247e197d9343b864189ef1cb09f500a
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.other_template.yml
@@ -0,0 +1,10 @@
+id: other_template
+label: Template with a different tag
+migration_tags:
+ - Different Template Test
+source:
+ plugin: empty
+process:
+ src: raboof
+destination:
+ plugin: entity:user
diff --git a/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
new file mode 100644
index 0000000000000000000000000000000000000000..fd8211945ca8c6528ac819af9c3a4898689b1b35
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/migration_templates/migrate.migration.url_template.yml
@@ -0,0 +1,10 @@
+id: url_template
+label: Template test - url
+migration_tags:
+ - Template Test
+source:
+ plugin: empty
+process:
+ src: foobar
+destination:
+ plugin: url_alias
diff --git a/core/modules/migrate/tests/modules/template_test/template_test.info.yml b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
new file mode 100644
index 0000000000000000000000000000000000000000..d396c63d234a2674721be4df6e357ec05be498be
--- /dev/null
+++ b/core/modules/migrate/tests/modules/template_test/template_test.info.yml
@@ -0,0 +1,5 @@
+name: 'Migration template test'
+type: module
+package: Testing
+version: VERSION
+core: 8.x
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
index 1a518fbff695f6f310c57ebe0fbfe267c2c6c135..a1b6265618a5574beddbbf730fcb78146bd3637f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_action_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_action_settings.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: action.settings
-dependencies:
- module:
- - action
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
index 2daaa8a8dc4042f111414c72c5d02a4323176220..e94ae9e4667c6a92bf4e050b1521ca042090746e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_feed.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_feed.yml
@@ -4,7 +4,6 @@ migration_tags:
- Drupal 6
source:
plugin: d6_aggregator_feed
-
process:
fid: fid
title: title
@@ -16,10 +15,5 @@ process:
image: image
etag: etag
modified: modified
-
destination:
plugin: entity:aggregator_feed
-dependencies:
- module:
- - aggregator
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
index aa80302e82bf71af319e6f4ef7042c16edd4cc77..615c550138379864fcf5e246ea898f1442b597da 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_item.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_item.yml
@@ -22,9 +22,3 @@ destination:
migration_dependencies:
required:
- d6_aggregator_feed
-dependencies:
- config:
- - migrate.migration.d6_aggregator_feed
- module:
- - aggregator
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
index 9720f6e5a9bfa231e3ea33ef084a8790bfdd3692..5b8e6059a27a29ab681a73345d864a59e9ce23cf 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_aggregator_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_aggregator_settings.yml
@@ -23,7 +23,3 @@ process:
destination:
plugin: config
config_name: aggregator.settings
-dependencies:
- module:
- - aggregator
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
index 1d831191f22c1cf5e8aa415707a8998e1ae24b17..5f91c1614a9b595c636515ee439ab7bde9419f1a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block.yml
@@ -92,11 +92,3 @@ migration_dependencies:
- d6_menu
- d6_custom_block
- d6_user_role
-dependencies:
- config:
- - migrate.migration.d6_custom_block
- - migrate.migration.d6_menu
- - migrate.migration.d6_user_role
- module:
- - block
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
index 08935eed9e68258462f560a97e69ccac542dfc68..e8164e17cfd71968bc334e06fcc534c1178e5f2c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_body_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_body_field.yml
@@ -23,10 +23,3 @@ destination:
migration_dependencies:
required:
- d6_block_content_type
-dependencies:
- config:
- - migrate.migration.d6_block_content_type
- module:
- - block_content
- - field
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
index f055a61808585765422d35db98653bb2a1944493..8dcea2f0f02ce3f9db8740752f9934f674438a9c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_block_content_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_block_content_type.yml
@@ -14,7 +14,3 @@ process:
label: 'constants/label'
destination:
plugin: entity:block_content_type
-dependencies:
- module:
- - block_content
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
index c8007e0e60770ba3108bd7e7fe0c9bf8a28932e0..683f56aaabc7e1bae9e4975dc9e258cde7075c4d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book.yml
@@ -21,10 +21,3 @@ destination:
migration_dependencies:
required:
- d6_node
-dependencies:
- config:
- - migrate.migration.d6_node
- module:
- - book
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
index 35302d0313e808dda173afbc38275c9e79546a2e..e885d37e9e8598f690053adf07ba32553632b273 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_book_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_book_settings.yml
@@ -15,7 +15,3 @@ process:
destination:
plugin: config
config_name: book.settings
-dependencies:
- module:
- - book
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
similarity index 69%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
index b3203f913261eab08396c5b709e6707057eed9eb..fa159894c27e17cacab01fe04891a56a6b056b49 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_revision.yml
@@ -15,10 +15,3 @@ migration_dependencies:
required:
- d6_cck_field_values
- d6_node_revision
-dependencies:
- config:
- - migrate.migration.d6_cck_field_values
- - migrate.migration.d6_node_revision
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
index 0457ecfe7b96fdd99ed8fc4893a47b2f97a81596..27027baf7218809313ccfad0f1ce28262c51b35b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_cck_field_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_cck_field_values.yml
@@ -19,11 +19,3 @@ migration_dependencies:
- d6_node
- d6_field_formatter_settings
- d6_field_instance_widget_settings
-dependencies:
- config:
- - migrate.migration.d6_field_formatter_settings
- - migrate.migration.d6_field_instance_widget_settings
- - migrate.migration.d6_node
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
index 94fb020f05117631ecc68ea98c353df85fb171c3..1a41ec7aecfdc8c8b6c5bd5fb24581ead14d2c10 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment.yml
@@ -43,15 +43,3 @@ migration_dependencies:
- d6_comment_entity_display
- d6_comment_entity_form_display
- d6_filter_format
-dependencies:
- config:
- - migrate.migration.d6_comment_entity_display
- - migrate.migration.d6_comment_entity_form_display
- - migrate.migration.d6_comment_type
- - migrate.migration.d6_filter_format
- - migrate.migration.d6_node
- - migrate.migration.d6_user
- module:
- - comment
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
index 99e373b4034287d63aac81bf61c19698749206c5..e06c08fcce4dbe6305fb81ab819704683659e4b5 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_display.yml
@@ -24,9 +24,3 @@ destination:
migration_dependencies:
required:
- d6_comment_field_instance
-dependencies:
- config:
- - migrate.migration.d6_comment_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
index 059517f2047eff4d5afc3d3f7fa02d593fce6581..a05a11baeb6ddebc0ca0b7579e7b71509e770a58 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display.yml
@@ -23,9 +23,3 @@ destination:
migration_dependencies:
required:
- d6_comment_field_instance
-dependencies:
- config:
- - migrate.migration.d6_comment_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
index 8a362728923ea3bd70c13814025b7a4c21f7d4c2..a7e3e6b248ffe26457c7e1cf0e669ea9152b3268 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_entity_form_display_subject.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_entity_form_display_subject.yml
@@ -30,9 +30,3 @@ destination:
migration_dependencies:
required:
- d6_comment_type
-dependencies:
- config:
- - migrate.migration.d6_comment_type
- module:
- - comment
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
index ab22f23cfbba3c91cf9db3b9e5839b229ef09ae6..aca8783c1ac1a29886577988a2e717f00f1d9346 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field.yml
@@ -17,11 +17,3 @@ destination:
migration_dependencies:
required:
- d6_comment_type
-dependencies:
- config:
- - migrate.migration.d6_comment_type
- module:
- - comment
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
index 669ea94377715473d306e8c82c7f176a497fb7b6..f00b5278bf3a929427d2fb0d9ae9205cd3a52560 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_field_instance.yml
@@ -32,11 +32,3 @@ migration_dependencies:
required:
- d6_comment_field
- d6_node_type
-dependencies:
- config:
- - migrate.migration.d6_comment_field
- - migrate.migration.d6_node_type
- module:
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
index 35dfde0ad5ae0a4cb43d981e7621b1c7bcd609b3..54ffec188affc50d8d0d3120aa7a8418051c0893 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_comment_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_comment_type.yml
@@ -13,8 +13,3 @@ process:
description: description
destination:
plugin: entity:comment_type
-dependencies:
- module:
- - comment
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
index cab9f3be1390b6775a72c50c707fab34de8fac16..d50e4fe751cb7fde74d239e4d7dfde5e0a5242d4 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_category.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_category.yml
@@ -20,7 +20,3 @@ process:
weight: weight
destination:
plugin: entity:contact_form
-dependencies:
- module:
- - contact
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
index d0e4a3da8987e790e82424c2e119b97009c1d1c8..e0897feec3339d7e84ef4866f918cc3d6d3e37f6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_contact_settings.yml
@@ -20,9 +20,3 @@ destination:
migration_dependencies:
required:
- d6_contact_category
-dependencies:
- config:
- - migrate.migration.d6_contact_category
- module:
- - contact
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
similarity index 72%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
index be6cebfadd93de6287b80143ce3870636d8a1cf7..0564f892011ed486d89ce904f8e7db521d2deadc 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_custom_block.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_custom_block.yml
@@ -22,10 +22,3 @@ migration_dependencies:
required:
- d6_filter_format
- d6_block_content_body_field
-dependencies:
- config:
- - migrate.migration.d6_block_content_body_field
- - migrate.migration.d6_filter_format
- module:
- - block_content
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
index 44448e6717454babfbcf6ca335a2ccd62d7524f6..c7f3422201d354d8fd1f29dc4e735e9a7ecfb9ec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_date_formats.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_date_formats.yml
@@ -19,6 +19,3 @@ process:
pattern: value
destination:
plugin: entity:date_format
-dependencies:
- module:
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
index fb387f57eac67967d4f70257e9476928a090c57f..6c94b1e2eb8e7e771264a3518513f0e017b45eba 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_dblog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_dblog_settings.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: dblog.settings
-dependencies:
- module:
- - dblog
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
similarity index 98%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
index 191c538f262d920f9c3725b4aa66955cd972962d..9ff9e2444ac70223430106d5d48c11bfc1ba8b22 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field.yml
@@ -131,8 +131,3 @@ process:
destination:
plugin: md_entity:field_storage_config
-dependencies:
- module:
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
similarity index 97%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
index 883e811c81c149b5cd7e16607b34ba8f80c15de9..880d77fa562541d31c3921ff30c966d20b601781 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_formatter_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_formatter_settings.yml
@@ -261,10 +261,3 @@ migration_dependencies:
required:
- d6_field_instance
- d6_view_modes
-dependencies:
- config:
- - migrate.migration.d6_field_instance
- - migrate.migration.d6_view_modes
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
index 5710433297c0bd543548f71c98bff0534d039cf7..f876dfd1f8c52db6cf1fe3e656e823854e64b7e1 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance.yml
@@ -50,11 +50,3 @@ migration_dependencies:
required:
- d6_node_type
- d6_field
-dependencies:
- config:
- - migrate.migration.d6_field
- - migrate.migration.d6_node_type
- module:
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
index a343abedb457fe68509d8ce5db976a0c68ffbb9a..d67a14b998856a620844df67a5c4249de234cf3d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_field_instance_widget_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_field_instance_widget_settings.yml
@@ -60,9 +60,3 @@ destination:
migration_dependencies:
required:
- d6_field_instance
-dependencies:
- config:
- - migrate.migration.d6_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
index 508d0bba6d3294cae4af3d5a7fd06c6a730ba666..e8ead684bd22c07bbfc177b93faa7dc14b758bc8 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file.yml
@@ -23,7 +23,3 @@ process:
uid: uid
destination:
plugin: entity:file
-dependencies:
- module:
- - file
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
index f2ca1707d3ebe69fff06fbe1ff98c8bcd0680c2e..f08d92e64a97d27dec7d8de93684fdd4aa8279a9 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_file_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_file_settings.yml
@@ -15,7 +15,3 @@ process:
destination:
plugin: config
config_name: file.settings
-dependencies:
- module:
- - file
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
index 9efaf7a6a6ed5721751109b826dfbdc8e0e5e56c..16982d39ae2bca3e76668419af5eefff20b7aace 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_filter_format.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_filter_format.yml
@@ -43,7 +43,3 @@ process:
destination:
plugin: entity:filter_format
no_stub: true
-dependencies:
- module:
- - filter
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
index 72e4814f32c62c9bc6679127130a23c164541152..2df6496d7c659f518b4dac63ef0b13c4f87dd731 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_forum_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_forum_settings.yml
@@ -27,9 +27,3 @@ destination:
migration_dependencies:
required:
- d6_taxonomy_vocabulary
-dependencies:
- config:
- - migrate.migration.d6_taxonomy_vocabulary
- module:
- - forum
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
index a38bd9221fb3fff3c815d4104c9b958f820305cf..e9440cc847d795c0d1d56c48973258bda6d01d06 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_locale_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_locale_settings.yml
@@ -13,7 +13,3 @@ process:
destination:
plugin: config
config_name: locale.settings
-dependencies:
- module:
- - locale
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
similarity index 76%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
index 4def0bf37039fed36ea2f36477d83061c765af56..0d353c22ee22b71af8df56ea708b0fa69572395f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu.yml
@@ -10,7 +10,3 @@ process:
description: description
destination:
plugin: entity:menu
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
index c98a3a7210ad354a4d687468bce9570ec0f90d50..67531604ef083415a0f784ec8ced148f18ba294b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_links.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_links.yml
@@ -45,9 +45,3 @@ destination:
migration_dependencies:
required:
- d6_menu
-dependencies:
- config:
- - migrate.migration.d6_menu
- module:
- - menu_link_content
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
index 8ec039d84122219e2fca06335baada57047f5354..9f332fb67051fecf37dfeaf3f66a7f17c375a57c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_menu_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_menu_settings.yml
@@ -15,7 +15,3 @@ process:
destination:
plugin: config
config_name: menu_ui.settings
-dependencies:
- module:
- - menu_ui
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
index 4092a25ef87769b8c7c6767175a96df6a3cc7278..947a3cf8da9aa99adcf731d238921bf5d12bd589 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node.yml
@@ -53,12 +53,3 @@ migration_dependencies:
optional:
- d6_field_instance_widget_settings
- d6_field_formatter_settings
-dependencies:
- config:
- - migrate.migration.d6_filter_format
- - migrate.migration.d6_node_settings
- - migrate.migration.d6_node_type
- - migrate.migration.d6_user
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
index 42118b3ab729cb945bb6182b62ee2fa614be250f..0b1a4789d7021010b9c2da839ea1f0af3c523072 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_revision.yml
@@ -40,9 +40,3 @@ destination:
migration_dependencies:
required:
- d6_node
-dependencies:
- config:
- - migrate.migration.d6_node
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
index c7f6d24eccb5784ba2c7d896b2bc7ab86d336de5..8f6da3555b2c633661274a7333c9ab426166b4db 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_promote.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_promote.yml
@@ -17,9 +17,3 @@ destination:
migration_dependencies:
required:
- d6_node_type
-dependencies:
- config:
- - migrate.migration.d6_node_type
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
index ec7afd6bf154bec30585fd55950d333d39942b68..5d3e41294c3b247e8a5bbd76c7c97678deae432d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_status.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_status.yml
@@ -17,9 +17,3 @@ destination:
migration_dependencies:
required:
- d6_node_type
-dependencies:
- config:
- - migrate.migration.d6_node_type
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
index 4f1b613713c629cbf5be2b196907b511022cb32c..8a8f7b7cb09da30db36dbb8ac490365f8ea6b7e0 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_setting_sticky.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_setting_sticky.yml
@@ -17,9 +17,3 @@ destination:
migration_dependencies:
required:
- d6_node_type
-dependencies:
- config:
- - migrate.migration.d6_node_type
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
index 336383a217188587ff73890bb0e07082c0f8cfe1..3e12dd6ec3031005926a1ecaaf6a0face7f4729c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_settings.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: node.settings
-dependencies:
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
index 7bd24ac6da6664eea10946d1c3f6463b689408c9..009c3a0efb0b59a72e587a2604171d8c28129622 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_node_type.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_node_type.yml
@@ -22,7 +22,3 @@ process:
create_body_label: body_label
destination:
plugin: entity:node_type
-dependencies:
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
similarity index 58%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
index 047de4d04cc5835e53ddc0f7305cb12f1837dc26..d2b81a5bfb69cbf2d40cd6bb6d60d0eac4071fa6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_profile_values.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_profile_values.yml
@@ -16,12 +16,3 @@ migration_dependencies:
- d6_user_profile_field_instance
- d6_user_profile_entity_display
- d6_user_profile_entity_form_display
-dependencies:
- config:
- - migrate.migration.d6_user
- - migrate.migration.d6_user_profile_entity_display
- - migrate.migration.d6_user_profile_entity_form_display
- - migrate.migration.d6_user_profile_field_instance
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
index 6c05d1f1ed0a98a4ca2727c64b6dd90a69e44484..d12aca6760ffbae2da5c56fd6d7f3201db2a54cc 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_page.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_page.yml
@@ -23,7 +23,3 @@ process:
plugin: d6_search_configuration_rankings
destination:
plugin: entity:search_page
-dependencies:
- module:
- - migrate_drupal
- - search
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
similarity index 89%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
index 8e832e4ef671127fc5d3da14c8714b069afafa08..36f5447c8d34138cabadc999e5f43a52e316f147 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_search_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_search_settings.yml
@@ -20,7 +20,3 @@ process:
destination:
plugin: config
config_name: search.settings
-dependencies:
- module:
- - migrate_drupal
- - search
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
index 0791f1144ad531f14c68724bb8ae9e9e1ce78f08..d616a59963270dc93bec1e2c2cd16b87aeab5052 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_simpletest_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_simpletest_settings.yml
@@ -19,7 +19,3 @@ process:
destination:
plugin: config
config_name: simpletest.settings
-dependencies:
- module:
- - migrate_drupal
- - simpletest
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
index b223e36647f85debf0347309dcdf6563cb80f9d8..a8820db2e1e43efefe1c6ecd783867f610688042 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_statistics_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_statistics_settings.yml
@@ -15,7 +15,3 @@ process:
destination:
plugin: config
config_name: statistics.settings
-dependencies:
- module:
- - migrate_drupal
- - statistics
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
similarity index 83%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
index e962856200fcb80771cad43607741e6ccaaaec8d..4c9fd4969c4f6c98c490bc9654936c63a7219469 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_syslog_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_syslog_settings.yml
@@ -13,7 +13,3 @@ process:
destination:
plugin: config
config_name: syslog.settings
-dependencies:
- module:
- - migrate_drupal
- - syslog
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
index 47be1354f9c608376b6147993ccc65df68d66267..01970a900a92b53336772b96c4507885390c62ec 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_cron.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_cron.yml
@@ -14,7 +14,3 @@ process:
destination:
plugin: config
config_name: system.cron
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
index 925b5a9fe129b26b4019ed1e2337b419d5402fa2..1405ff5a2a9fca25627fc5204c9cc8ade0d04e92 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_file.yml
@@ -18,7 +18,3 @@ process:
destination:
plugin: config
config_name: system.file
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
index 8e36db7cc9d06c8d38e4df07d4008ea940815919..739268dd4aaa053630d8f329fb4269f6f0ccbf52 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_filter.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_filter.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: system.filter
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
index 9581291e8accc803cd4b639ebad11908d816a7d6..f19d516ac9a4b44ca3248753035bf5bc4e5c0561 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: system.image
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
index 583ca5bea678f008b90c6aaa7d9bde97d98123d8..52b90520a8ce7aa176afa8a3c63f248ca80b8774 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_image_gd.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_image_gd.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: system.image.gd
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
index b75bc7e97880db877b3429cf5d4562e6dae405ad..bca03ec084ff2163d96e80abd85374bce69af7da 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_logging.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_logging.yml
@@ -19,7 +19,3 @@ process:
destination:
plugin: config
config_name: system.logging
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
index 0d93cd13f9ee851b26b926c546cb87994434b2ab..b902551ac49120d1128ccc3bb2e9ea9139b70b8e 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_maintenance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_maintenance.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: system.maintenance
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
index a10edfd271dda67dedf38ae222a3e7ecbff3eef7..edff8115e2095057a54e3ffd7f29a4b9a1cc0040 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_performance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_performance.yml
@@ -18,7 +18,3 @@ process:
destination:
plugin: config
config_name: system.performance
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
index 7f5d3d4a60293bae1c9afd07103c49f9019c26f3..7d5fd146d5ec559117f4164abe188d08be29b1d2 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_rss.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_rss.yml
@@ -13,7 +13,3 @@ process:
destination:
plugin: config
config_name: system.rss
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
similarity index 93%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
index 78bb7ab8292f5d05861d851682458df086ec5de5..04b99ceebfa4505bd1bd67a8ca3575b61f1e6bc5 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_system_site.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_system_site.yml
@@ -39,7 +39,3 @@ process:
destination:
plugin: config
config_name: system.site
-dependencies:
- module:
- - migrate_drupal
- - system
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
index 094e9d792c9988bf2a5fd531726884579d9d8c01..3fe9e1fd90c5a76292485237f91c53ffec086e50 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_settings.yml
@@ -13,7 +13,3 @@ process:
destination:
plugin: config
config_name: taxonomy.settings
-dependencies:
- module:
- - migrate_drupal
- - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
index c70d3c8072fc5db0267261342b9565fabfb1118c..546f95fbe924861355c4f9a2f48f38e36054e8cd 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_term.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_term.yml
@@ -27,9 +27,3 @@ destination:
migration_dependencies:
required:
- d6_taxonomy_vocabulary
-dependencies:
- config:
- - migrate.migration.d6_taxonomy_vocabulary
- module:
- - migrate_drupal
- - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
index 1a9cb9c908e27a77e11438ef04f9ba3c226e0684..414d2cb4f226f191280ef9de89837e84290c6888 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_taxonomy_vocabulary.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_taxonomy_vocabulary.yml
@@ -21,7 +21,3 @@ process:
weight: weight
destination:
plugin: entity:taxonomy_vocabulary
-dependencies:
- module:
- - migrate_drupal
- - taxonomy
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
similarity index 66%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
index 6d0befe85bf8174bb8b58c20f9df9845316d2585..4eaf93572431e1f59be4c17a9429a32869589fbe 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node.yml
@@ -20,11 +20,3 @@ migration_dependencies:
- d6_vocabulary_entity_display
- d6_vocabulary_entity_form_display
- d6_node
-dependencies:
- config:
- - migrate.migration.d6_node
- - migrate.migration.d6_vocabulary_entity_display
- - migrate.migration.d6_vocabulary_entity_form_display
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
similarity index 75%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
index 9193738355b7437ac8e3e249b72ae643c242113f..319d000595cba83d5f61ddb940cbf35d123cdeaa 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_term_node_revision.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_term_node_revision.yml
@@ -20,10 +20,3 @@ migration_dependencies:
required:
- d6_term_node
- d6_node_revision
-dependencies:
- config:
- - migrate.migration.d6_node_revision
- - migrate.migration.d6_term_node
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
similarity index 82%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
index 56d3303aa5642a47e9c60378d70d23c281d76747..8f6fff30b550fe378bdb30da53bf2af118ad3668 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_text_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_text_settings.yml
@@ -11,7 +11,3 @@ process:
destination:
plugin: config
config_name: text.settings
-dependencies:
- module:
- - migrate_drupal
- - text
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
similarity index 90%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
index 8a61e51cc3c7c304eca1690f40009328dec7a7e7..4e873502e5c28d8202f87bc2177b7e617b0f5f71 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_update_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_update_settings.yml
@@ -19,7 +19,3 @@ process:
destination:
plugin: config
config_name: update.settings
-dependencies:
- module:
- - migrate_drupal
- - update
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
similarity index 77%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
index fedda76ed8505cde115a2a922fd93c872185d621..2d04241aff52d2aa47406815599421e7d9838768 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload.yml
@@ -25,10 +25,3 @@ migration_dependencies:
required:
- d6_file
- d6_node
-dependencies:
- config:
- - migrate.migration.d6_file
- - migrate.migration.d6_node
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
index 8daf13f1ca00aafba254a1a3a81cd169296b6743..28e154b0a66786ecde07a2936eba0dcc1d031e5b 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_display.yml
@@ -25,9 +25,3 @@ destination:
migration_dependencies:
required:
- d6_upload_field_instance
-dependencies:
- config:
- - migrate.migration.d6_upload_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
index f248d1d2512bdacb5e0b7b1b4c79b17daab3e4d5..7725659cbecefce32c7874b898f62a730d141223 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_entity_form_display.yml
@@ -26,9 +26,3 @@ destination:
migration_dependencies:
required:
- d6_upload_field_instance
-dependencies:
- config:
- - migrate.migration.d6_upload_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
index 15df33af531895e6a6b28231f9ca63e193693b4e..e92b8019df0e8fe64e696e5ba95b32bc7771a979 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field.yml
@@ -21,9 +21,3 @@ process:
'settings/display_field': 'constants/display_field'
destination:
plugin: md_entity:field_storage_config
-dependencies:
- module:
- - field
- - file
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
similarity index 78%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
index 701351263765d5c400db58e4e7625f09bea22fef..4410ec011515ef14a4ef2fe08b48a315589124c9 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_upload_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_upload_field_instance.yml
@@ -22,11 +22,3 @@ migration_dependencies:
required:
- d6_upload_field
- d6_node_type
-dependencies:
- config:
- - migrate.migration.d6_node_type
- - migrate.migration.d6_upload_field
- module:
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
similarity index 88%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
index 454ded854040c3e9dceba4e4e51563e3cfaecf7b..7fcbaec035e138f8f1e77c77126a6178b2c44720 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_url_alias.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_url_alias.yml
@@ -19,9 +19,5 @@ process:
- constants/slash
- dst
langcode: language
-
destination:
plugin: url_alias
-dependencies:
- module:
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
similarity index 87%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
index b55e2ec03e5effb71a3d93807b99f42823e43468..05ff4a00e5e16401b7a557fcbe67c30ae61d9d69 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user.yml
@@ -35,9 +35,3 @@ migration_dependencies:
- d6_user_picture_file
- d6_user_picture_entity_display
- d6_user_picture_entity_form_display
-dependencies:
- config:
- - migrate.migration.d6_user_role
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
similarity index 80%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
index 7da9e52ce7c84b1480b57767c24ce251ee06f504..04291550ccacb8fac66b5709011a16c7f5dc91b4 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_contact_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_contact_settings.yml
@@ -21,9 +21,3 @@ destination:
migration_dependencies:
required:
- d6_user
-dependencies:
- config:
- - migrate.migration.d6_user
- module:
- - contact
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
similarity index 96%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
index 15ea0d41cec0717c66f7dcbaba2ab5dfc6ea0f50..bc3badf6bd3a69068fc9faf7227a04b547bf418f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_mail.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_mail.yml
@@ -37,7 +37,3 @@ process:
destination:
plugin: config
config_name: user.mail
-dependencies:
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
index dd6be798938b4bda546c70bb3991304e5d1d878a..f38bc36068b734ec45f94a9ce07b7bdcf1a7c20c 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_display.yml
@@ -28,9 +28,3 @@ destination:
migration_dependencies:
required:
- d6_user_picture_field_instance
-dependencies:
- config:
- - migrate.migration.d6_user_picture_field_instance
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
index 9d2182b992b49b6648ca2f6c3bd6de535edf253d..4e422287e5bc02942f0872c2284fd622f8203cb5 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_entity_form_display.yml
@@ -27,9 +27,3 @@ destination:
migration_dependencies:
required:
- d6_user_picture_field_instance
-dependencies:
- config:
- - migrate.migration.d6_user_picture_field_instance
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
index eefb62d92692888961bc19ce85cef625b46b2968..27a39a23c0eee7daec108dbb916932b53ad5faa3 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field.yml
@@ -18,9 +18,3 @@ process:
cardinality: 'constants/cardinality'
destination:
plugin: md_entity:field_storage_config
-dependencies:
- module:
- - field
- - image
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
similarity index 86%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
index 14dfc0e9173d57be627c0ca43835cbe961b305f1..7dc83b19b68df4153051329ac7c4810d274ff309 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_field_instance.yml
@@ -28,10 +28,3 @@ destination:
migration_dependencies:
required:
- d6_user_picture_field
-dependencies:
- config:
- - migrate.migration.d6_user_picture_field
- module:
- - field
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
index 9be01218c9920cf718a2a120dc26a467b4366674..0bc5a0b3cfc6e19b78c7db412b42f6cb08dc8891 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_picture_file.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_picture_file.yml
@@ -24,7 +24,3 @@ migration_dependencies:
# migration as an optional dependency to ensure it runs first.
optional:
- d6_file
-dependencies:
- module:
- - file
- - migrate_drupal
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
similarity index 94%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
index 7da0e7ad529f000d54383cc09ce1b154efd360c0..3e7b467788904601d1f495ec3286412025e614c6 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_display.yml
@@ -38,7 +38,3 @@ process:
4: true # PROFILE_HIDDEN
destination:
plugin: component_entity_display
-dependencies:
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
similarity index 95%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
index 18fab1bbec4701e51202f6cf40068e816a616f31..d1cde0b65a31db15450e3e93478973657824cb0a 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_entity_form_display.yml
@@ -47,7 +47,3 @@ process:
4: true # PROFILE_HIDDEN
destination:
plugin: component_entity_form_display
-dependencies:
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
similarity index 91%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
index 1f84573d75795a9af36a7008fd743c313554cd64..99176739a31e7fd070c9d8eec6d2f5447a0e6f28 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field.yml
@@ -32,8 +32,3 @@ process:
list: -1
destination:
plugin: md_entity:field_storage_config
-dependencies:
- module:
- - field
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
similarity index 79%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
index 30c593849804560094c057b05d81531c441cd3e2..ec0e526677a0e82666a25c8f6a113ac935ce3bff 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_profile_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_profile_field_instance.yml
@@ -19,10 +19,3 @@ destination:
migration_dependencies:
required:
- d6_user_profile_field
-dependencies:
- config:
- - migrate.migration.d6_user_profile_field
- module:
- - field
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
index 46edcc807dd96093d1a4cf5c31b9bd4f900e6123..e15058bb6d5e38e4f445af3166488de11afddb0d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_role.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_role.yml
@@ -44,9 +44,3 @@ destination:
migration_dependencies:
required:
- d6_filter_format
-dependencies:
- config:
- - migrate.migration.d6_filter_format
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
index 09e2eb7780ea4bbfdf9dafc387f7f95b93bda54d..5984d51af324d03014f4399c1c2371defa1051cc 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_user_settings.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_user_settings.yml
@@ -26,7 +26,3 @@ process:
destination:
plugin: config
config_name: user.settings
-dependencies:
- module:
- - migrate_drupal
- - user
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
similarity index 92%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
index f8bf6fd230767681ab76aae01d09a5ab8e24aac3..e2e0c8f4833b55aac37cddc56be7c2067fa6461f 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_view_modes.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_view_modes.yml
@@ -35,10 +35,5 @@ process:
full: "Full"
targetEntityType: 'constants/targetEntityType'
status: 'constants/status'
-
destination:
plugin: entity:entity_view_mode
-dependencies:
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
index 5c0c9c20016acad43ce8637f27235bda44c6bcce..9295acd92996a5941fb7470d25ba58870a24498d 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_display.yml
@@ -26,9 +26,3 @@ destination:
migration_dependencies:
required:
- d6_vocabulary_field_instance
-dependencies:
- config:
- - migrate.migration.d6_vocabulary_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
similarity index 84%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
index 91b540a79a5639ac3bcafd12e4dfe1c65fb49641..3dbc95ba367948e406a74557b09e94794c32a091 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_entity_form_display.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_entity_form_display.yml
@@ -24,9 +24,3 @@ destination:
migration_dependencies:
required:
- d6_vocabulary_field_instance
-dependencies:
- config:
- - migrate.migration.d6_vocabulary_field_instance
- module:
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
similarity index 81%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
index e11864f6a1f20e36f5fda2a9d526e488100155d6..c2c8cf81debcf08c5a2ec0a1ccd0c83561b0f287 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field.yml
@@ -23,11 +23,3 @@ destination:
migration_dependencies:
required:
- d6_taxonomy_vocabulary
-dependencies:
- config:
- - migrate.migration.d6_taxonomy_vocabulary
- module:
- - entity_reference
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
similarity index 85%
rename from core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
rename to core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
index 166155fe0b0310dbc7a1a5dfd01e3c48e03a7cfd..3d7ff35b106a6c59e1a7c3c42ef918a875b7e471 100644
--- a/core/modules/migrate_drupal/config/optional/migrate.migration.d6_vocabulary_field_instance.yml
+++ b/core/modules/migrate_drupal/migration_templates/migrate.migration.d6_vocabulary_field_instance.yml
@@ -23,10 +23,3 @@ destination:
migration_dependencies:
required:
- d6_vocabulary_field
-dependencies:
- config:
- - migrate.migration.d6_vocabulary_field
- module:
- - field
- - migrate_drupal
- - node
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
index b8a436fb446515ba38df5f83c1a4b757cb44c188..673514cf82f1b8e2030f0d7ee1ca0b782d881453 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php
@@ -8,6 +8,8 @@
namespace Drupal\migrate_drupal\Tests;
use Drupal\migrate\Tests\MigrateTestBase;
+use Drupal\migrate\Entity\Migration;
+use Drupal\Component\Plugin\Exception\PluginNotFoundException;
/**
* Base class for Drupal migration tests.
@@ -42,4 +44,26 @@ protected function getDumpDirectory() {
return __DIR__ . '/Table';
}
+ /**
+ * Turn all the migration templates for the specified drupal version into
+ * real migration entities so we can test them.
+ *
+ * @param string $version
+ * Drupal version as provided in migration_tags - e.g., 'Drupal 6'.
+ */
+ protected function installMigrations($version) {
+ $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag($version);
+ foreach ($migration_templates as $template) {
+ try {
+ $migration = Migration::create($template);
+ $migration->save();
+ }
+ catch (PluginNotFoundException $e) {
+ // Migrations requiring modules not enabled will throw an exception.
+ // Ignoring this exception is equivalent to placing config in the
+ // optional subdirectory - the migrations we require for the test will
+ // be successfully saved.
+ }
+ }
+ }
}
diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
index 6b01174b35ee4fca4cd151e592d175b8ba258dc0..f1b9f319985cdbd8ca9ad9e4d2b2b95043801956 100644
--- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php
@@ -8,9 +8,6 @@
namespace Drupal\migrate_drupal\Tests;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\Core\Config\ExtensionInstallStorage;
-use Drupal\Core\Config\InstallStorage;
-use Drupal\Core\Config\StorageInterface;
use Drupal\migrate\MigrateExecutable;
use Drupal\simpletest\TestBase;
@@ -58,7 +55,6 @@ public function testDrupal() {
$this->loadDumps($dumps);
$classes = $this->getTestClassesList();
- $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), InstallStorage::CONFIG_OPTIONAL_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE);
foreach ($classes as $class) {
if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) {
$class::migrateDumpAlter($this);
@@ -68,16 +64,6 @@ public function testDrupal() {
// Run every migration in the order specified by the storage controller.
foreach (entity_load_multiple('migration', static::$migrations) as $migration) {
(new MigrateExecutable($migration, $this))->import();
-
- // Ensure that the default migration has the correct dependencies.
- list($base_name, ) = explode(':', $migration->id(), 2);
- $default_configuration = $extension_install_storage->read('migrate.migration.' . $base_name);
- $default_dependencies = isset($default_configuration['dependencies']) ? $default_configuration['dependencies'] : [];
- $this->assertEqual($default_dependencies, $migration->getDependencies(), SafeMarkup::format('Dependencies in @id match after installing. Default configuration @first is equal to active configuration @second.', array(
- '@id' => $migration->id(),
- '@first' => var_export($default_dependencies, TRUE),
- '@second' => var_export($migration->getDependencies(), TRUE)
- )));
}
foreach ($classes as $class) {
$test_object = new $class($this->testId);
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
index 697ab2c341f008a14be6d36b28f927b5f2412027..b277e3b1ff9c81f667254c9bef6b90996fb19c30 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php
@@ -198,6 +198,8 @@ protected function setUp() {
'name' => $this->randomMachineName(),
'status' => 1,
])->enforceIsNew(TRUE)->save();
+
+ $this->installMigrations('Drupal 6');
}
/**
diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
index e50871893fe8ce4bd6e75f913d3b0028ae4953ea..cad03dafc6992a8d52919f1e4f469d23dd1b8820 100644
--- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
+++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6TestBase.php
@@ -14,6 +14,14 @@
*/
abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp() {
+ parent::setUp();
+ $this->installMigrations('Drupal 6');
+ }
+
/**
* {@inheritdoc}
*/