diff -u b/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml --- b/core/modules/block_content/migration_templates/block_content_body_field.yml +++ b/core/modules/block_content/migration_templates/block_content_body_field.yml @@ -32,5 +32,5 @@ required: - block_content_type -source_module: +provider: - block_content - migrate_drupal diff -u b/core/modules/block_content/migration_templates/block_content_entity_display.yml b/core/modules/block_content/migration_templates/block_content_entity_display.yml --- b/core/modules/block_content/migration_templates/block_content_entity_display.yml +++ b/core/modules/block_content/migration_templates/block_content_entity_display.yml @@ -34,7 +34,7 @@ migration_dependencies: required: - block_content_body_field -source_module: +provider: - block_content - migrate_drupal diff -u b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml --- b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml +++ b/core/modules/block_content/migration_templates/block_content_entity_form_display.yml @@ -31,7 +31,7 @@ migration_dependencies: required: - block_content_body_field -source_module: +provider: - block_content - migrate_drupal diff -u b/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml --- b/core/modules/block_content/migration_templates/block_content_type.yml +++ b/core/modules/block_content/migration_templates/block_content_type.yml @@ -19,5 +19,5 @@ destination: plugin: entity:block_content_type -source_module: +provider: - block_content - migrate_drupal reverted: --- b/core/modules/migrate/src/Plugin/MigrationProviderInterface.php +++ /dev/null @@ -1,20 +0,0 @@ -container->get('module_handler'); - $modules = $this->coreModuleListDataProvider(); - $modules_enabled = $module_handler->getModuleList(); - $modules_to_enable = array_keys(array_diff_key($modules, $modules_enabled)); - $this->enableModules($modules_to_enable); - - /** @var \Drupal\migrate\Plugin\MigrationPluginManager $manager */ - $pluginManager = $this->container->get('plugin.manager.migration'); - // Get all the migrations - $migrations = $pluginManager->createInstances(array_keys($pluginManager->getDefinitions())); - /** @var \Drupal\migrate\Plugin\Migration $migration */ - foreach ($migrations as $migration) { - $source_module = NULL; - $destination_module = NULL; - $source_plugin = $migration->getSourcePlugin(); - if ($source_plugin instanceof MigrationProviderInterface) { - $source_module = $source_plugin->getProvider(); - } - $destination_plugin = $migration->getDestinationPlugin(); - if ($destination_plugin instanceof MigrationProviderInterface) { - $destination_module = $destination_plugin->getProvider(); - } - $migration_id = $migration->getPluginId(); - if ($migration_id == 'module_test') { - $this->assertFalse($source_module, new FormattableMarkup('Source module not found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertFalse($destination_module, new FormattableMarkup('Destination module not found for @migration_id.', ['@migration_id' => $migration_id])); - } - elseif ($migration_id == 'module_no_annotation') { - $this->assertFalse($source_module, new FormattableMarkup('Source module not found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertTrue($destination_module, new FormattableMarkup('Destination module found for @migration_id.', ['@migration_id' => $migration_id])); - } - else { - $this->assertTrue($source_module, new FormattableMarkup('Source module found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertTrue($destination_module, new FormattableMarkup('Destination module found for @migration_id.', ['@migration_id' => $migration_id])); - } - // Destination module can't be migrate or migrate_drupal or migrate_drupal_ui - $invalid_destinations = ['migrate', 'migrate_drupal', 'migrate_drupal_ui']; - $this->assertNotContains($destination_module, $invalid_destinations, new FormattableMarkup('Invalid destination for @migration_id.', ['@migration_id' => $migration_id])); - } - } - -} reverted: --- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php.rej +++ /dev/null @@ -1,667 +0,0 @@ -*************** -*** 21,678 **** - use MigrationConfigurationTrait; - - /** -- * Mapping of known migrations and their source and destination modules. -- * -- * @todo https://www.drupal.org/node/2569805 Hardcoding this information is -- * not robust - the migrations themselves should hold the necessary -- * information. -- * -- * @var array[] -- */ -- protected $moduleUpgradePaths = [ -- 'action_settings' => [ -- 'source_module' => 'system', -- 'destination_module' => 'action', -- ], -- 'd6_aggregator_feed' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd6_aggregator_item' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd6_aggregator_settings' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd7_aggregator_feed' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd7_aggregator_item' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd7_aggregator_settings' => [ -- 'source_module' => 'aggregator', -- 'destination_module' => 'aggregator', -- ], -- 'd7_blocked_ips' => [ -- 'source_module' => 'system', -- 'destination_module' => 'ban', -- ], -- 'd6_block' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block', -- ], -- 'd7_block' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block', -- ], -- 'block_content_entity_form_display' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'block_content_entity_display' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'block_content_body_field' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'block_content_type' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'd6_custom_block' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'd7_custom_block' => [ -- 'source_module' => 'block', -- 'destination_module' => 'block_content', -- ], -- 'd6_book' => [ -- 'source_module' => 'book', -- 'destination_module' => 'book', -- ], -- 'd6_book_settings' => [ -- 'source_module' => 'book', -- 'destination_module' => 'book', -- ], -- 'd6_comment' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_entity_display' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_entity_form_display' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_entity_form_display_subject' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_field' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_field_instance' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd6_comment_type' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_entity_display' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_entity_form_display' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_entity_form_display_subject' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_field' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_field_instance' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'd7_comment_type' => [ -- 'source_module' => 'comment', -- 'destination_module' => 'comment', -- ], -- 'contact_category' => [ -- 'source_module' => 'contact', -- 'destination_module' => 'contact', -- ], -- 'd6_contact_settings' => [ -- 'source_module' => 'contact', -- 'destination_module' => 'contact', -- ], -- 'd7_contact_settings' => [ -- 'source_module' => 'contact', -- 'destination_module' => 'contact', -- ], -- 'd6_dblog_settings' => [ -- 'source_module' => 'dblog', -- 'destination_module' => 'dblog', -- ], -- 'd7_dblog_settings' => [ -- 'source_module' => 'dblog', -- 'destination_module' => 'dblog', -- ], -- 'default_language' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd6_field' => [ -- 'source_module' => 'content', -- 'destination_module' => 'field', -- ], -- 'd6_field_formatter_settings' => [ -- 'source_module' => 'content', -- 'destination_module' => 'field', -- ], -- 'd6_field_instance' => [ -- 'source_module' => 'content', -- 'destination_module' => 'field', -- ], -- 'd6_field_instance_widget_settings' => [ -- 'source_module' => 'content', -- 'destination_module' => 'field', -- ], -- 'd7_field' => [ -- 'source_module' => 'field', -- 'destination_module' => 'field', -- ], -- 'd7_field_formatter_settings' => [ -- 'source_module' => 'field', -- 'destination_module' => 'field', -- ], -- 'd7_field_instance' => [ -- 'source_module' => 'field', -- 'destination_module' => 'field', -- ], -- 'd7_field_instance_widget_settings' => [ -- 'source_module' => 'field', -- 'destination_module' => 'field', -- ], -- 'd7_view_modes' => [ -- 'source_module' => 'field', -- 'destination_module' => 'field', -- ], -- 'd6_file' => [ -- 'source_module' => 'system', -- 'destination_module' => 'file', -- ], -- 'file_settings' => [ -- 'source_module' => 'system', -- 'destination_module' => 'file', -- ], -- 'd6_upload' => [ -- 'source_module' => 'upload', -- 'destination_module' => 'file', -- ], -- 'd6_upload_entity_display' => [ -- 'source_module' => 'upload', -- 'destination_module' => 'file', -- ], -- 'd6_upload_entity_form_display' => [ -- 'source_module' => 'upload', -- 'destination_module' => 'file', -- ], -- 'd6_upload_field' => [ -- 'source_module' => 'upload', -- 'destination_module' => 'file', -- ], -- 'd6_upload_field_instance' => [ -- 'source_module' => 'upload', -- 'destination_module' => 'file', -- ], -- 'd7_file' => [ -- 'source_module' => 'file', -- 'destination_module' => 'file', -- ], -- 'd6_filter_format' => [ -- 'source_module' => 'filter', -- 'destination_module' => 'filter', -- ], -- 'd7_filter_format' => [ -- 'source_module' => 'filter', -- 'destination_module' => 'filter', -- ], -- 'd7_filter_settings' => [ -- 'source_module' => 'filter', -- 'destination_module' => 'filter', -- ], -- 'd6_forum_settings' => [ -- 'source_module' => 'forum', -- 'destination_module' => 'forum', -- ], -- 'd7_forum_settings' => [ -- 'source_module' => 'forum', -- 'destination_module' => 'forum', -- ], -- 'd7_global_theme_settings' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_imagecache_presets' => [ -- 'source_module' => 'imagecache', -- 'destination_module' => 'image', -- ], -- 'd7_image_settings' => [ -- 'source_module' => 'image', -- 'destination_module' => 'image', -- ], -- 'd7_image_styles' => [ -- 'source_module' => 'image', -- 'destination_module' => 'image', -- ], -- 'd6_language_content_settings' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd7_language_content_settings' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd6_language_negotiation_settings' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd7_language_negotiation_settings' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'language_prefixes_and_domains' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd6_language_types' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'language' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'd7_language_types' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'language', -- ], -- 'locale_settings' => [ -- 'source_module' => 'locale', -- 'destination_module' => 'locale', -- ], -- 'd6_menu_links' => [ -- 'source_module' => 'menu', -- 'destination_module' => 'menu_link_content', -- ], -- 'menu_settings' => [ -- 'source_module' => 'menu', -- 'destination_module' => 'menu_ui', -- ], -- 'd7_menu_links' => [ -- 'source_module' => 'menu', -- 'destination_module' => 'menu_link_content', -- ], -- 'd6_node' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_translation' => [ -- 'source_module' => 'translation', -- 'destination_module' => 'content_translation', -- ], -- 'd6_node_revision' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_setting_promote' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_setting_status' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_setting_sticky' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_settings' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_node_type' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_view_modes' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node_revision' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node_settings' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node_translation' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node_title_label' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd7_node_type' => [ -- 'source_module' => 'node', -- 'destination_module' => 'node', -- ], -- 'd6_url_alias' => [ -- 'source_module' => 'path', -- 'destination_module' => 'path', -- ], -- 'd7_url_alias' => [ -- 'source_module' => 'path', -- 'destination_module' => 'path', -- ], -- 'search_page' => [ -- 'source_module' => 'search', -- 'destination_module' => 'search', -- ], -- 'd6_search_settings' => [ -- 'source_module' => 'search', -- 'destination_module' => 'search', -- ], -- 'd7_search_settings' => [ -- 'source_module' => 'search', -- 'destination_module' => 'search', -- ], -- 'd7_shortcut' => [ -- 'source_module' => 'shortcut', -- 'destination_module' => 'shortcut', -- ], -- 'd7_shortcut_set' => [ -- 'source_module' => 'shortcut', -- 'destination_module' => 'shortcut', -- ], -- 'd7_shortcut_set_users' => [ -- 'source_module' => 'shortcut', -- 'destination_module' => 'shortcut', -- ], -- 'd6_simpletest_settings' => [ -- 'source_module' => 'simpletest', -- 'destination_module' => 'simpletest', -- ], -- 'd7_simpletest_settings' => [ -- 'source_module' => 'simpletest', -- 'destination_module' => 'simpletest', -- ], -- 'statistics_settings' => [ -- 'source_module' => 'statistics', -- 'destination_module' => 'statistics', -- ], -- 'd6_syslog_settings' => [ -- 'source_module' => 'syslog', -- 'destination_module' => 'syslog', -- ], -- 'd7_syslog_settings' => [ -- 'source_module' => 'syslog', -- 'destination_module' => 'syslog', -- ], -- 'd6_date_formats' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_system_cron' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_system_date' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_system_file' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_image' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_image_gd' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_logging' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_maintenance' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_system_performance' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_rss' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'system_site' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_authorize' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_cron' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_date' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_file' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_mail' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd7_system_performance' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_menu' => [ -- 'source_module' => 'menu', -- 'destination_module' => 'system', -- ], -- 'd7_menu' => [ -- 'source_module' => 'menu', -- 'destination_module' => 'system', -- ], -- 'taxonomy_settings' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_taxonomy_term' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_taxonomy_vocabulary' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_term_node' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_term_node_revision' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_vocabulary_entity_display' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_vocabulary_entity_form_display' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_vocabulary_field' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd6_vocabulary_field_instance' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd7_taxonomy_term' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'd7_taxonomy_vocabulary' => [ -- 'source_module' => 'taxonomy', -- 'destination_module' => 'taxonomy', -- ], -- 'text_settings' => [ -- 'source_module' => 'text', -- 'destination_module' => 'text', -- ], -- 'd7_tracker_node' => [ -- 'source_module' => 'tracker', -- 'destination_module' => 'tracker', -- ], -- 'd7_tracker_settings' => [ -- 'source_module' => 'tracker', -- 'destination_module' => 'tracker', -- ], -- 'd7_tracker_user' => [ -- 'source_module' => 'tracker', -- 'destination_module' => 'tracker', -- ], -- 'update_settings' => [ -- 'source_module' => 'update', -- 'destination_module' => 'update', -- ], -- 'd6_profile_values' => [ -- 'source_module' => 'profile', -- 'destination_module' => 'user', -- ], -- 'd7_theme_settings' => [ -- 'source_module' => 'system', -- 'destination_module' => 'system', -- ], -- 'd6_user' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd6_user_contact_settings' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd6_user_mail' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd6_user_picture_file' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd6_user_role' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd6_user_settings' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd7_user' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd7_user_flood' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd7_user_mail' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'd7_user_role' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'user_picture_entity_display' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'user_picture_entity_form_display' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'user_picture_field' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'user_picture_field_instance' => [ -- 'source_module' => 'user', -- 'destination_module' => 'user', -- ], -- 'user_profile_entity_display' => [ -- 'source_module' => 'profile', -- 'destination_module' => 'user', -- ], -- 'user_profile_entity_form_display' => [ -- 'source_module' => 'profile', -- 'destination_module' => 'user', -- ], -- 'user_profile_field' => [ -- 'source_module' => 'profile', -- 'destination_module' => 'user', -- ], -- 'user_profile_field_instance' => [ -- 'source_module' => 'profile', -- 'destination_module' => 'user', -- ], -- 'd6_i18n_user_profile_field_instance' => [ -- 'source_module' => 'i18n', -- 'destination_module' => 'user', -- ], -- ]; -- -- /** - * The state service. - * - * @var \Drupal\Core\State\StateInterface ---- 22,27 ---- - use MigrationConfigurationTrait; - - /** - * The state service. - * - * @var \Drupal\Core\State\StateInterface only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyTranslation.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyTranslation.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_taxonomy_vocabulary_translation", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class VocabularyTranslation extends DrupalSqlBase {