diff -u b/core/modules/action/migration_templates/action_settings.yml b/core/modules/action/migration_templates/action_settings.yml --- b/core/modules/action/migration_templates/action_settings.yml +++ b/core/modules/action/migration_templates/action_settings.yml @@ -7,7 +7,7 @@ plugin: variable variables: - actions_max_stack - provider: action + source_module: action process: recursion_limit: actions_max_stack destination: diff -u b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml --- b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml +++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml @@ -12,7 +12,7 @@ - aggregator_teaser_length - aggregator_clear - aggregator_summary_items - provider: aggregator + source_module: aggregator process: fetcher: aggregator_fetcher parser: aggregator_parser diff -u b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml --- b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml +++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml @@ -12,7 +12,7 @@ - aggregator_teaser_length - aggregator_clear - aggregator_summary_items - provider: aggregator + source_module: aggregator process: fetcher: aggregator_fetcher parser: aggregator_parser 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 @@ -19,7 +19,7 @@ type: string field_name: type: string - provider: block + source_module: block process: entity_type: entity_type bundle: bundle @@ -32,5 +32,5 @@ required: - block_content_type -provider: +source_module: - 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 @@ -22,7 +22,7 @@ type: string field_name: type: string - provider: block + source_module: block process: entity_type: entity_type bundle: bundle @@ -34,7 +34,7 @@ migration_dependencies: required: - block_content_body_field -provider: +source_module: - 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 @@ -20,7 +20,7 @@ type: string field_name: type: string - provider: block + source_module: block process: entity_type: entity_type bundle: bundle @@ -31,7 +31,7 @@ migration_dependencies: required: - block_content_body_field -provider: +source_module: - 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 @@ -13,11 +13,11 @@ id: type: string - provider: block + source_module: block process: id: id label: label destination: plugin: entity:block_content_type -provider: +source_module: - block_content - migrate_drupal diff -u b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php --- b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php +++ b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_box", - * source_provider = "block" + * source_module = "block" * ) */ class Box extends DrupalSqlBase { diff -u b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php --- b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php +++ b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_block_custom", - * source_provider = "block" + * source_module = "block" * ) */ class BlockCustom extends DrupalSqlBase { diff -u b/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml --- b/core/modules/book/migration_templates/d6_book_settings.yml +++ b/core/modules/book/migration_templates/d6_book_settings.yml @@ -8,7 +8,7 @@ - book_child_type - book_block_mode - book_allowed_types - provider: book + source_module: book process: child_type: book_child_type 'block/navigation/mode': book_block_mode diff -u b/core/modules/book/src/Plugin/migrate/source/d6/Book.php b/core/modules/book/src/Plugin/migrate/source/d6/Book.php --- b/core/modules/book/src/Plugin/migrate/source/d6/Book.php +++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_book", - * source_provider = "book" + * source_module = "book" * ) */ class Book extends DrupalSqlBase { diff -u b/core/modules/comment/migration_templates/d6_comment_entity_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_display.yml --- b/core/modules/comment/migration_templates/d6_comment_entity_display.yml +++ b/core/modules/comment/migration_templates/d6_comment_entity_display.yml @@ -12,7 +12,7 @@ label: hidden type: comment_default weight: 20 - provider: comment + source_module: comment process: entity_type: 'constants/entity_type' field_name: 'constants/field_name' diff -u b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml --- b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml +++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display.yml @@ -11,7 +11,7 @@ options: type: comment_default weight: 20 - provider: comment + source_module: comment process: entity_type: 'constants/entity_type' field_name: 'constants/field_name' diff -u b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml --- b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml +++ b/core/modules/comment/migration_templates/d6_comment_entity_form_display_subject.yml @@ -11,7 +11,7 @@ options: type: string_textfield weight: 10 - provider: comment + source_module: comment process: entity_type: 'constants/entity_type' field_name: 'constants/field_name' diff -u b/core/modules/comment/migration_templates/d6_comment_field.yml b/core/modules/comment/migration_templates/d6_comment_field.yml --- b/core/modules/comment/migration_templates/d6_comment_field.yml +++ b/core/modules/comment/migration_templates/d6_comment_field.yml @@ -7,7 +7,7 @@ constants: entity_type: node type: comment - provider: comment + source_module: comment process: entity_type: 'constants/entity_type' field_name: comment_type diff -u b/core/modules/comment/migration_templates/d6_comment_field_instance.yml b/core/modules/comment/migration_templates/d6_comment_field_instance.yml --- b/core/modules/comment/migration_templates/d6_comment_field_instance.yml +++ b/core/modules/comment/migration_templates/d6_comment_field_instance.yml @@ -8,7 +8,7 @@ entity_type: node label: Comments required: true - provider: comment + source_module: comment process: entity_type: 'constants/entity_type' label: 'constants/label' diff -u b/core/modules/comment/migration_templates/d6_comment_type.yml b/core/modules/comment/migration_templates/d6_comment_type.yml --- b/core/modules/comment/migration_templates/d6_comment_type.yml +++ b/core/modules/comment/migration_templates/d6_comment_type.yml @@ -6,7 +6,7 @@ plugin: d6_comment_variable_per_comment_type constants: entity_type: node - provider: comment + source_module: comment process: target_entity_type_id: 'constants/entity_type' id: comment_type diff -u b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml --- b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml @@ -6,7 +6,7 @@ plugin: i18n_variable variables: - site_offline_message - provider: system + source_module: system process: langcode: language message: site_offline_message diff -u b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml --- b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml @@ -13,7 +13,7 @@ - site_frontpage - site_403 - site_404 - provider: system + source_module: system process: langcode: language name: site_name diff -u b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml --- b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml @@ -19,7 +19,7 @@ - user_mail_register_pending_approval_body - user_mail_status_blocked_subject - user_mail_status_blocked_body - provider: system + source_module: system process: langcode: language 'status_activated/subject': diff -u b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml --- b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml @@ -10,7 +10,7 @@ - user_email_verification - user_register - anonymous - provider: system + source_module: system process: langcode: language 'notify/status_blocked': user_mail_status_blocked_notify diff -u b/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml --- b/core/modules/dblog/migration_templates/d6_dblog_settings.yml +++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml @@ -6,7 +6,7 @@ plugin: variable variables: - dblog_row_limit - provider: dblog + source_module: dblog process: row_limit: dblog_row_limit destination: diff -u b/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml --- b/core/modules/dblog/migration_templates/d7_dblog_settings.yml +++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml @@ -6,7 +6,7 @@ plugin: variable variables: - dblog_row_limit - provider: dblog + source_module: dblog process: row_limit: dblog_row_limit destination: diff -u b/core/modules/field/migration_templates/d7_field.yml b/core/modules/field/migration_templates/d7_field.yml --- b/core/modules/field/migration_templates/d7_field.yml +++ b/core/modules/field/migration_templates/d7_field.yml @@ -9,7 +9,7 @@ constants: status: true langcode: und - provider: field + source_module: field process: entity_type: entity_type status: 'constants/status' diff -u b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml --- b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml +++ b/core/modules/field/migration_templates/d7_field_instance_widget_settings.yml @@ -9,7 +9,7 @@ constants: form_mode: default third_party_settings: { } - provider: field + source_module: field process: # We skip field types that don't exist because they weren't migrated by the # field migration. diff -u b/core/modules/field/migration_templates/d7_view_modes.yml b/core/modules/field/migration_templates/d7_view_modes.yml --- b/core/modules/field/migration_templates/d7_view_modes.yml +++ b/core/modules/field/migration_templates/d7_view_modes.yml @@ -4,7 +4,7 @@ - Drupal 7 source: plugin: d7_view_mode - provider: field + source_module: field process: mode: plugin: static_map diff -u b/core/modules/file/migration_templates/d6_file.yml b/core/modules/file/migration_templates/d6_file.yml --- b/core/modules/file/migration_templates/d6_file.yml +++ b/core/modules/file/migration_templates/d6_file.yml @@ -12,7 +12,7 @@ # table are specified, and must end with a /. See source_full_path # configuration in this migration's process pipeline as an example. source_base_path: '' - provider: system + source_module: system process: # If you are using both this migration and d6_user_picture_file in a custom # migration and executing migrations incrementally, it is strongly diff -u b/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml --- b/core/modules/file/migration_templates/d6_upload_field.yml +++ b/core/modules/file/migration_templates/d6_upload_field.yml @@ -6,14 +6,14 @@ # We do an empty source and a proper destination to have an idmap for # migration_dependencies. plugin: md_empty - provider: upload + source_module: upload constants: entity_type: node type: file name: upload cardinality: -1 display_field: true - provider: upload + source_module: upload process: entity_type: 'constants/entity_type' field_name: 'constants/name' diff -u b/core/modules/file/migration_templates/d7_file.yml b/core/modules/file/migration_templates/d7_file.yml --- b/core/modules/file/migration_templates/d7_file.yml +++ b/core/modules/file/migration_templates/d7_file.yml @@ -12,7 +12,7 @@ # table are specified, and must end with a /. See source_full_path # configuration in this migration's process pipeline as an example. source_base_path: '' - provider: file + source_module: file process: # If you are using this file to build a custom migration consider removing # the fid field to allow incremental migrations. diff -u b/core/modules/file/migration_templates/file_settings.yml b/core/modules/file/migration_templates/file_settings.yml --- b/core/modules/file/migration_templates/file_settings.yml +++ b/core/modules/file/migration_templates/file_settings.yml @@ -9,7 +9,7 @@ - file_description_type - file_description_length - file_icon_directory - provider: system + source_module: system process: 'description/type': file_description_type 'description/length': file_description_length diff -u b/core/modules/filter/migration_templates/d6_filter_format.yml b/core/modules/filter/migration_templates/d6_filter_format.yml --- b/core/modules/filter/migration_templates/d6_filter_format.yml +++ b/core/modules/filter/migration_templates/d6_filter_format.yml @@ -4,7 +4,7 @@ - Drupal 6 source: plugin: d6_filter_format - provider: filter + source_module: filter process: format: plugin: machine_name diff -u b/core/modules/filter/migration_templates/d7_filter_format.yml b/core/modules/filter/migration_templates/d7_filter_format.yml --- b/core/modules/filter/migration_templates/d7_filter_format.yml +++ b/core/modules/filter/migration_templates/d7_filter_format.yml @@ -4,7 +4,7 @@ - Drupal 7 source: plugin: d7_filter_format - provider: filter + source_module: filter process: format: format name: name diff -u b/core/modules/filter/migration_templates/d7_filter_settings.yml b/core/modules/filter/migration_templates/d7_filter_settings.yml --- b/core/modules/filter/migration_templates/d7_filter_settings.yml +++ b/core/modules/filter/migration_templates/d7_filter_settings.yml @@ -6,7 +6,7 @@ plugin: variable variables: - filter_fallback_format - provider: filter + source_module: filter process: fallback_format: filter_fallback_format destination: diff -u b/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml --- b/core/modules/forum/migration_templates/d6_forum_settings.yml +++ b/core/modules/forum/migration_templates/d6_forum_settings.yml @@ -11,7 +11,7 @@ - forum_block_num_0 - forum_block_num_1 - forum_nav_vocabulary - provider: forum + source_module: forum process: 'block/active/limit': forum_block_num_0 'block/new/limit': forum_block_num_1 diff -u b/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migration_templates/d7_forum_settings.yml --- b/core/modules/forum/migration_templates/d7_forum_settings.yml +++ b/core/modules/forum/migration_templates/d7_forum_settings.yml @@ -11,7 +11,7 @@ - forum_block_num_active - forum_block_num_new - forum_nav_vocabulary - provider: forum + source_module: forum process: 'block/active/limit': forum_block_num_active 'block/new/limit': forum_block_num_new diff -u b/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml --- b/core/modules/image/migration_templates/d7_image_settings.yml +++ b/core/modules/image/migration_templates/d7_image_settings.yml @@ -8,7 +8,7 @@ - allow_insecure_derivatives - suppress_itok_output - image_style_preview_image - provider: image + source_module: image process: suppress_itok_output: suppress_itok_output allow_insecure_derivatives: allow_insecure_derivatives diff -u b/core/modules/language/migration_templates/d6_language_content_settings.yml b/core/modules/language/migration_templates/d6_language_content_settings.yml --- b/core/modules/language/migration_templates/d6_language_content_settings.yml +++ b/core/modules/language/migration_templates/d6_language_content_settings.yml @@ -7,7 +7,7 @@ plugin: d6_language_content_settings constants: target_type: 'node' - provider: locale + source_module: locale process: # Ignore i18n_node_options_[node_type] options not available in Drupal 8, # i18n_required_node and i18n_newnode_current diff -u b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml --- b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml +++ b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml @@ -6,7 +6,7 @@ plugin: variable variables: - language_negotiation - provider: language + source_module: language process: session/parameter: plugin: default_value diff -u b/core/modules/language/migration_templates/d6_language_types.yml b/core/modules/language/migration_templates/d6_language_types.yml --- b/core/modules/language/migration_templates/d6_language_types.yml +++ b/core/modules/language/migration_templates/d6_language_types.yml @@ -6,7 +6,7 @@ plugin: variable variables: - language_negotiation - provider: language + source_module: language process: all: plugin: default_value diff -u b/core/modules/language/migration_templates/d7_language_content_settings.yml b/core/modules/language/migration_templates/d7_language_content_settings.yml --- b/core/modules/language/migration_templates/d7_language_content_settings.yml +++ b/core/modules/language/migration_templates/d7_language_content_settings.yml @@ -6,7 +6,7 @@ plugin: d7_language_content_settings constants: target_type: 'node' - provider: locale + source_module: locale process: # Ignore i18n_node_options_[node_type] options not available in Drupal 8, # i18n_required_node and i18n_newnode_current diff -u b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml --- b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml +++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml @@ -7,7 +7,7 @@ variables: - locale_language_negotiation_session_param - locale_language_negotiation_url_part - provider: locale + source_module: locale process: session/parameter: plugin: default_value diff -u b/core/modules/language/migration_templates/d7_language_types.yml b/core/modules/language/migration_templates/d7_language_types.yml --- b/core/modules/language/migration_templates/d7_language_types.yml +++ b/core/modules/language/migration_templates/d7_language_types.yml @@ -12,7 +12,7 @@ - locale_language_providers_weight_language - locale_language_providers_weight_language_content - locale_language_providers_weight_language_url - provider: language + source_module: language process: all: plugin: language_types diff -u b/core/modules/language/migration_templates/default_language.yml b/core/modules/language/migration_templates/default_language.yml --- b/core/modules/language/migration_templates/default_language.yml +++ b/core/modules/language/migration_templates/default_language.yml @@ -7,7 +7,7 @@ plugin: variable variables: - language_default - provider: locale + source_module: locale process: default_langcode: - diff -u b/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migration_templates/locale_settings.yml --- b/core/modules/locale/migration_templates/locale_settings.yml +++ b/core/modules/locale/migration_templates/locale_settings.yml @@ -8,7 +8,7 @@ variables: - locale_cache_strings - locale_js_directory - provider: locale + source_module: locale process: cache_strings: locale_cache_strings 'javascript/directory': locale_js_directory diff -u b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php --- b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php +++ b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php @@ -11,7 +11,7 @@ * * @MigrateSource( * id = "menu_link", - * source_provider = "menu" + * source_module = "menu" * ) */ class MenuLink extends DrupalSqlBase { diff -u b/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml --- b/core/modules/menu_ui/migration_templates/menu_settings.yml +++ b/core/modules/menu_ui/migration_templates/menu_settings.yml @@ -8,7 +8,7 @@ plugin: variable variables: - menu_override_parent_selector - provider: menu + source_module: menu process: override_parent_selector: menu_override_parent_selector destination: diff -u b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php --- b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php @@ -115,7 +115,7 @@ * {@inheritdoc} */ public function getProvider() { - return !empty($this->configuration['provider']) ? $this->configuration['provider'] : $this->pluginDefinition['provider']; + return !empty($this->configuration['destination_module']) ? $this->configuration['destination_module'] : $this->pluginDefinition['provider']; } } diff -u b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php --- b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php @@ -546,11 +546,11 @@ * {@inheritdoc} */ public function getProvider() { - if (!empty($this->configuration['provider'])) { - return $this->configuration['provider']; + if (!empty($this->configuration['source_module'])) { + return $this->configuration['source_module']; } - elseif (!empty($this->pluginDefinition['source_provider'])) { - return $this->pluginDefinition['source_provider']; + elseif (!empty($this->pluginDefinition['source_module'])) { + return $this->pluginDefinition['source_module']; } return NULL; } diff -u b/core/modules/migrate/tests/modules/migrate_external_translated_test/src/Plugin/migrate/source/MigrateExternalTranslatedTestSource.php b/core/modules/migrate/tests/modules/migrate_external_translated_test/src/Plugin/migrate/source/MigrateExternalTranslatedTestSource.php --- b/core/modules/migrate/tests/modules/migrate_external_translated_test/src/Plugin/migrate/source/MigrateExternalTranslatedTestSource.php +++ b/core/modules/migrate/tests/modules/migrate_external_translated_test/src/Plugin/migrate/source/MigrateExternalTranslatedTestSource.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "migrate_external_translated_test", - * source_provider = "migrate_external_translated_test" + * source_module = "migrate_external_translated_test" * ) */ class MigrateExternalTranslatedTestSource extends SourcePluginBase { diff -u b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php --- b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php +++ b/core/modules/migrate/tests/src/Kernel/Plugin/ProvidersExistTest.php @@ -8,7 +8,7 @@ use Drupal\migrate\Plugin\MigrationProviderInterface; /** - * Tests that providers exist for all source and destination plugins. + * Tests that modules exist for all source and destination plugins. * * @group migrate_drupal_ui */ @@ -19,10 +19,10 @@ /** * {@inheritdoc} */ - public static $modules = ['provider_test']; + public static $modules = ['module_test']; /** - * Tests that providers exist for all source and destination plugins. + * Tests that modules exist for all source and destination plugins. */ public function testProvidersExist() { // Install all available modules. @@ -38,32 +38,32 @@ $migrations = $pluginManager->createInstances(array_keys($pluginManager->getDefinitions())); /** @var \Drupal\migrate\Plugin\Migration $migration */ foreach ($migrations as $migration) { - $source_provider = NULL; - $destination_provider = NULL; + $source_module = NULL; + $destination_module = NULL; $source_plugin = $migration->getSourcePlugin(); if ($source_plugin instanceof MigrationProviderInterface) { - $source_provider = $source_plugin->getProvider(); + $source_module = $source_plugin->getProvider(); } $destination_plugin = $migration->getDestinationPlugin(); if ($destination_plugin instanceof MigrationProviderInterface) { - $destination_provider = $destination_plugin->getProvider(); + $destination_module = $destination_plugin->getProvider(); } $migration_id = $migration->getPluginId(); - if ($migration_id == 'provider_test') { - $this->assertFalse($source_provider, new FormattableMarkup('Source provider not found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertFalse($destination_provider, new FormattableMarkup('Destination provider not found for @migration_id.', ['@migration_id' => $migration_id])); + 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 == 'provider_no_annotation') { - $this->assertFalse($source_provider, new FormattableMarkup('Source provider not found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertTrue($destination_provider, new FormattableMarkup('Destination provider 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_provider, new FormattableMarkup('Source provider found for @migration_id.', ['@migration_id' => $migration_id])); - $this->assertTrue($destination_provider, new FormattableMarkup('Destination provider found for @migration_id.', ['@migration_id' => $migration_id])); + $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 provider can't be migrate or migrate_drupal or migrate_drupal_ui + // Destination module can't be migrate or migrate_drupal or migrate_drupal_ui $invalid_destinations = ['migrate', 'migrate_drupal', 'migrate_drupal_ui']; - $this->assertNotContains($destination_provider, $invalid_destinations, new FormattableMarkup('Invalid destination for @migration_id.', ['@migration_id' => $migration_id])); + $this->assertNotContains($destination_module, $invalid_destinations, new FormattableMarkup('Invalid destination for @migration_id.', ['@migration_id' => $migration_id])); } } diff -u b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php --- b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -404,26 +404,26 @@ foreach ($migrations as $migration) { $migration_id = $migration->getPluginId(); - $source_provider = NULL; + $source_module = NULL; $source_plugin = $migration->getSourcePlugin(); if ($source_plugin instanceof MigrationProviderInterface) { - $source_provider = $source_plugin->getProvider(); + $source_module = $source_plugin->getProvider(); } - if (!$source_provider) { - drupal_set_message($this->t('Source provider not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); + if (!$source_module) { + drupal_set_message($this->t('Source module not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); } - $destination_provider = NULL; + $destination_module = NULL; $destination_plugin = $migration->getDestinationPlugin(); if ($destination_plugin instanceof MigrationProviderInterface) { - $destination_provider = $destination_plugin->getProvider(); + $destination_module = $destination_plugin->getProvider(); } - if (!$destination_provider) { - drupal_set_message($this->t('Destination provider not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); + if (!$destination_module) { + drupal_set_message($this->t('Destination module not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); } - if ($source_provider && $destination_provider) { - $table_data[$source_provider][$destination_provider][$migration_id] = $migration->label(); + if ($source_module && $destination_module) { + $table_data[$source_module][$destination_module][$migration_id] = $migration->label(); } } // Sort the table by source module names and within that destination diff -u b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php --- b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php @@ -44,7 +44,7 @@ 'book', 'forum', 'statistics', - 'provider_test', + 'modules_available_test', ]; /** @@ -150,13 +150,13 @@ $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); - // Ensure we get errors about missing providers. - $this->assertText(t('Source provider not found for provider_no_annotation.')); - $this->assertText(t('Source provider not found for provider_test.')); - $this->assertText(t('Destination provider not found for provider_test')); + // Ensure we get errors about missing modules. + $this->assertText(t('Source module not found for module_no_annotation.')); + $this->assertText(t('Source module not found for modules_available_test.')); + $this->assertText(t('Destination module not found for modules_available_test')); - // Uninstall the module causing the missing provider error messages. - $this->container->get('module_installer')->uninstall(['provider_test'], TRUE); + // Uninstall the module causing the missing module error messages. + $this->container->get('module_installer')->uninstall(['modules_available_test'], TRUE); // Restart the upgrade process. $this->drupalGet('/upgrade'); @@ -169,10 +169,10 @@ $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); - // Ensure there are no errors about the missing providers. - $this->assertNoText(t('Source provider not found for provider_no_annotation.')); - $this->assertNoText(t('Source provider not found for provider_test.')); - $this->assertNoText(t('Destination provider not found for provider_test')); + // Ensure there are no errors about the missing modules. + $this->assertNoText(t('Source module not found for module_no_annotation.')); + $this->assertNoText(t('Source module not found for modules_available_test.')); + $this->assertNoText(t('Destination module not found for modules_available_test')); $this->drupalPostForm(NULL, [], t('Perform upgrade')); $this->assertText(t('Congratulations, you upgraded Drupal!')); reverted: --- b/core/modules/migrate_drupal_ui/tests/modules/provider_test/migration_templates/provider_no_annotation.yml +++ /dev/null @@ -1,13 +0,0 @@ -id: provider_no_annotation -label: Missing source annotation -migration_tags: - - Drupal 6 - - Drupal 7 -source: -# Test plugin without a source_provider annotation - plugin: no_source_provider -process: - message: site_offline_message -destination: - plugin: config - config_name: test.settings reverted: --- b/core/modules/migrate_drupal_ui/tests/modules/provider_test/migration_templates/provider_test.yml +++ /dev/null @@ -1,16 +0,0 @@ -id: provider_test -label: Missing source and destination provider -migration_tags: - - Drupal 6 - - Drupal 7 -source: - plugin: variable - variables: - - site_offline_message -# Do not add a provider for the test. -process: - message: site_offline_message -destination: - plugin: config -# An empty config_name will not have a destination provider. - config_name: reverted: --- b/core/modules/migrate_drupal_ui/tests/modules/provider_test/provider_test.info.yml +++ /dev/null @@ -1,6 +0,0 @@ -name: 'Provider missing' -type: module -description: 'Add a migration missing a source and destination and a source plugin missing a source provider.' -package: Testing -version: VERSION -core: 8.x reverted: --- b/core/modules/migrate_drupal_ui/tests/modules/provider_test/src/Plugin/migrate/source/NoSourceProvider.php +++ /dev/null @@ -1,31 +0,0 @@ -pluginDefinition['requirements_met'] === TRUE) { - if (isset($this->pluginDefinition['source_provider'])) { - if ($this->moduleExists($this->pluginDefinition['source_provider'])) { - if (isset($this->pluginDefinition['minimum_schema_version']) && !$this->getModuleSchemaVersion($this->pluginDefinition['source_provider']) < $this->pluginDefinition['minimum_schema_version']) { + if (isset($this->pluginDefinition['source_module'])) { + if ($this->moduleExists($this->pluginDefinition['source_module'])) { + if (isset($this->pluginDefinition['minimum_schema_version']) && !$this->getModuleSchemaVersion($this->pluginDefinition['source_module']) < $this->pluginDefinition['minimum_schema_version']) { throw new RequirementsException('Required minimum schema version ' . $this->pluginDefinition['minimum_schema_version'], ['minimum_schema_version' => $this->pluginDefinition['minimum_schema_version']]); } } else { - throw new RequirementsException('The module ' . $this->pluginDefinition['source_provider'] . ' is not enabled in the source site.', ['source_provider' => $this->pluginDefinition['source_provider']]); + throw new RequirementsException('The module ' . $this->pluginDefinition['source_module'] . ' is not enabled in the source site.', ['source_module' => $this->pluginDefinition['source_module']]); } } } only in patch2: unchanged: --- a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php @@ -43,7 +43,7 @@ class DrupalSqlBaseTest extends MigrateTestCase { */ public function testSourceProviderNotActive() { $plugin_definition['requirements_met'] = TRUE; - $plugin_definition['source_provider'] = 'module1'; + $plugin_definition['source_module'] = 'module1'; /** @var \Drupal\Core\State\StateInterface $state */ $state = $this->getMock('Drupal\Core\State\StateInterface'); /** @var \Drupal\Core\Entity\EntityManagerInterface $entity_manager */ @@ -57,7 +57,7 @@ public function testSourceProviderNotActive() { } catch (RequirementsException $e) { // Ensure requirements are set on the exception. - $this->assertEquals(['source_provider' => 'module1'], $e->getRequirements()); + $this->assertEquals(['source_module' => 'module1'], $e->getRequirements()); // Re-throw so PHPUnit can assert the exception. throw $e; } only in patch2: unchanged: --- a/core/modules/node/migration_templates/d6_node_translation.yml +++ b/core/modules/node/migration_templates/d6_node_translation.yml @@ -52,4 +52,4 @@ migration_dependencies: - d6_field_instance_widget_settings - d6_field_formatter_settings - d6_upload_field_instance -provider: migrate_drupal +source_module: migrate_drupal only in patch2: unchanged: --- a/core/modules/node/migration_templates/d7_node_translation.yml +++ b/core/modules/node/migration_templates/d7_node_translation.yml @@ -39,4 +39,4 @@ migration_dependencies: - language optional: - d7_field_instance -provider: migrate_drupal +source_module: migrate_drupal only in patch2: unchanged: --- a/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d6_view_mode", - * source_provider = "content" + * source_module = "content" * ) */ class ViewMode extends ViewModeBase { only in patch2: unchanged: --- a/core/modules/node/src/Plugin/migrate/source/d7/Node.php +++ b/core/modules/node/src/Plugin/migrate/source/d7/Node.php @@ -17,7 +17,7 @@ * * @MigrateSource( * id = "d7_node", - * source_provider = "node" + * source_module = "node" * ) */ class Node extends FieldableEntity { only in patch2: unchanged: --- a/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php +++ b/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d7_node_revision", - * source_provider = "node" + * source_module = "node" * ) */ class NodeRevision extends Node { only in patch2: unchanged: --- a/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php +++ b/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d7_node_type", - * source_provider = "node" + * source_module = "node" * ) */ class NodeType extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php +++ b/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_url_alias", - * source_provider = "path" + * source_module = "path" * ) */ class UrlAlias extends UrlAliasBase { only in patch2: unchanged: --- a/core/modules/path/src/Plugin/migrate/source/d7/UrlAlias.php +++ b/core/modules/path/src/Plugin/migrate/source/d7/UrlAlias.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_url_alias", - * source_provider = "path" + * source_module = "path" * ) */ class UrlAlias extends UrlAliasBase { only in patch2: unchanged: --- a/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php +++ b/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_shortcut", - * source_provider = "shortcut" + * source_module = "shortcut" * ) */ class Shortcut extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php +++ b/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_shortcut_set", - * source_provider = "shortcut" + * source_module = "shortcut" * ) */ class ShortcutSet extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php +++ b/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_shortcut_set_users", - * source_provider = "shortcut" + * source_module = "shortcut" * ) */ class ShortcutSetUsers extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/system/src/Plugin/migrate/source/Menu.php +++ b/core/modules/system/src/Plugin/migrate/source/Menu.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "menu", - * source_provider = "menu" + * source_module = "menu" * ) */ class Menu extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/system/src/Plugin/migrate/source/d7/ThemeSettings.php +++ b/core/modules/system/src/Plugin/migrate/source/d7/ThemeSettings.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_theme_settings", - * source_provider = "system" + * source_module = "system" * ) */ class ThemeSettings extends VariableMultiRow { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/Term.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/Term.php @@ -12,7 +12,7 @@ * * @MigrateSource( * id = "taxonomy_term", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) * * @deprecated in Drupal 8.3.0, intended to be removed in Drupal 9.0.0. only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php @@ -12,7 +12,7 @@ * * @MigrateSource( * id = "d6_taxonomy_term", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class Term extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_term_node", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class TermNode extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php @@ -11,7 +11,7 @@ * * @MigrateSource( * id = "d6_taxonomy_vocabulary", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class Vocabulary extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d6_taxonomy_vocabulary_per_type", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class VocabularyPerType extends Vocabulary { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php @@ -12,7 +12,7 @@ * * @MigrateSource( * id = "d7_taxonomy_term", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class Term extends FieldableEntity { only in patch2: unchanged: --- a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_taxonomy_vocabulary", - * source_provider = "taxonomy" + * source_module = "taxonomy" * ) */ class Vocabulary extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerNode.php +++ b/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerNode.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_tracker_node", - * source_provider = "tracker" + * source_module = "tracker" * ) */ class TrackerNode extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerUser.php +++ b/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerUser.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_tracker_user", - * source_provider = "tracker" + * source_module = "tracker" * ) */ class TrackerUser extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/user/src/Plugin/migrate/source/ProfileField.php +++ b/core/modules/user/src/Plugin/migrate/source/ProfileField.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "profile_field", - * source_provider = "profile" + * source_module = "profile" * ) */ class ProfileField extends DrupalSqlBase { only in patch2: unchanged: --- a/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php +++ b/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_profile_field_values", - * source_provider = "profile" + * source_module = "profile" * ) */ class ProfileFieldValues extends DrupalSqlBase {