diff --git a/core/modules/action/migration_templates/action_settings.yml b/core/modules/action/migration_templates/action_settings.yml index df69e33b60ecaf334fbc0139201cd6cade2628a4..a99676b7a6467376835203ddfc07c38a5b630324 100644 --- a/core/modules/action/migration_templates/action_settings.yml +++ b/core/modules/action/migration_templates/action_settings.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - actions_max_stack + source_module: action process: recursion_limit: actions_max_stack destination: diff --git a/core/modules/action/src/Plugin/migrate/source/Action.php b/core/modules/action/src/Plugin/migrate/source/Action.php index ac14a44b4700c98357c367fbe665c4978a291c8f..f3ff266ca82d35eb19711163605f04836eac7590 100644 --- a/core/modules/action/src/Plugin/migrate/source/Action.php +++ b/core/modules/action/src/Plugin/migrate/source/Action.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "action", - * source_provider = "system" + * source_module = "system" * ) */ class Action extends DrupalSqlBase { diff --git a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml index 72372e4093bf75bf42b5a99ffd5e13209f9098b9..d6ebf3d64251e3e176ff3f7ff82190797b5f488d 100644 --- a/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml +++ b/core/modules/aggregator/migration_templates/d6_aggregator_settings.yml @@ -12,6 +12,7 @@ source: - aggregator_teaser_length - aggregator_clear - aggregator_summary_items + source_module: aggregator process: fetcher: aggregator_fetcher parser: aggregator_parser diff --git a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml index c8c793fdd193e9a8dd6b387f7c03cf90a25008d3..3396950c8a0017816a3318be3b56f3b9a8045891 100644 --- a/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml +++ b/core/modules/aggregator/migration_templates/d7_aggregator_settings.yml @@ -12,6 +12,7 @@ source: - aggregator_teaser_length - aggregator_clear - aggregator_summary_items + source_module: aggregator process: fetcher: aggregator_fetcher parser: aggregator_parser diff --git a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php index 59244d4e4af5e76006c10510f89d4e8afa1b257e..7d01536ae9d1ce365a82ede7fb6d71244d2b9f6a 100644 --- a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php +++ b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorFeed.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "aggregator_feed", - * source_provider = "aggregator" + * source_module = "aggregator" * ) */ class AggregatorFeed extends DrupalSqlBase { diff --git a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php index 428c558ea7c48e04f295d37a191550dc1ca72767..8cde1f83d1e669007afe715dbdbc8701912968c9 100644 --- a/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php +++ b/core/modules/aggregator/src/Plugin/migrate/source/AggregatorItem.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "aggregator_item", - * source_provider = "aggregator" + * source_module = "aggregator" * ) */ class AggregatorItem extends DrupalSqlBase { diff --git a/core/modules/ban/src/Plugin/migrate/source/d7/BlockedIps.php b/core/modules/ban/src/Plugin/migrate/source/d7/BlockedIps.php index fc4d87758279edd76a23fab904c73f282c5d8156..7d3eeebba2e2022203f26348bc6716976a8a1eba 100644 --- a/core/modules/ban/src/Plugin/migrate/source/d7/BlockedIps.php +++ b/core/modules/ban/src/Plugin/migrate/source/d7/BlockedIps.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d7_blocked_ips", - * source_provider = "system" + * source_module = "system" * ) */ class BlockedIps extends DrupalSqlBase { diff --git a/core/modules/block/src/Plugin/migrate/source/Block.php b/core/modules/block/src/Plugin/migrate/source/Block.php index df4c0e9e194e56cb2e84935d714fa9a5a3923d66..6ec421c8ff4b59df52337c30642072d21ac08649 100644 --- a/core/modules/block/src/Plugin/migrate/source/Block.php +++ b/core/modules/block/src/Plugin/migrate/source/Block.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "block", - * source_provider = "block" + * source_module = "block" * ) */ class Block extends DrupalSqlBase { diff --git a/core/modules/block_content/migration_templates/block_content_body_field.yml b/core/modules/block_content/migration_templates/block_content_body_field.yml index b51d0321681bfd1aea20299982011221c916d92f..a40ac204f2fa76a1fd4b414184e36f180a795ac2 100644 --- a/core/modules/block_content/migration_templates/block_content_body_field.yml +++ b/core/modules/block_content/migration_templates/block_content_body_field.yml @@ -19,6 +19,7 @@ source: type: string field_name: type: string + source_module: block process: entity_type: entity_type bundle: bundle diff --git a/core/modules/block_content/migration_templates/block_content_entity_display.yml b/core/modules/block_content/migration_templates/block_content_entity_display.yml index 06a35d7331a45fc712a89df3369117db19018f25..9d75e6fb1cefbe7637b928f3084b842c8f9418a2 100644 --- a/core/modules/block_content/migration_templates/block_content_entity_display.yml +++ b/core/modules/block_content/migration_templates/block_content_entity_display.yml @@ -22,6 +22,7 @@ source: type: string field_name: type: string + source_module: block process: entity_type: entity_type bundle: bundle diff --git a/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 index 92b5a10c1dede44e1627b4ae3e2dcaf9db74ac47..d8f387e3ef3586db214ae5a54aa4146ff2f8a774 100644 --- a/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,6 +20,7 @@ source: type: string field_name: type: string + source_module: block process: entity_type: entity_type bundle: bundle diff --git a/core/modules/block_content/migration_templates/block_content_type.yml b/core/modules/block_content/migration_templates/block_content_type.yml index bc75eeac477538567fe7015acba6b10b8e9357a1..ca797b94e40b6328c17440fc86b790d61999f9f7 100644 --- a/core/modules/block_content/migration_templates/block_content_type.yml +++ b/core/modules/block_content/migration_templates/block_content_type.yml @@ -12,6 +12,7 @@ source: ids: id: type: string + source_module: block process: id: id label: label diff --git a/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php index a28927bd588d4ec8247446ef919d9f5c4e92a0c0..0a1da1920e4f0a9d2c6aac0a076acb2ac7bb7d33 100644 --- a/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php +++ b/core/modules/block_content/src/Plugin/migrate/source/d6/Box.php @@ -8,7 +8,8 @@ * Drupal 6 block source from database. * * @MigrateSource( - * id = "d6_box" + * id = "d6_box", + * source_module = "block" * ) */ class Box extends DrupalSqlBase { diff --git a/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php index ea336829bfb02d5c69c5422949eb9a7f551e7201..7c166e9d3d5de5c7f037edb187ea8fed22eae30a 100644 --- a/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php +++ b/core/modules/block_content/src/Plugin/migrate/source/d7/BlockCustom.php @@ -8,7 +8,8 @@ * Drupal 7 custom block source from database. * * @MigrateSource( - * id = "d7_block_custom" + * id = "d7_block_custom", + * source_module = "block" * ) */ class BlockCustom extends DrupalSqlBase { diff --git a/core/modules/book/migration_templates/d6_book_settings.yml b/core/modules/book/migration_templates/d6_book_settings.yml index 16e669539894f560cb1f54d5fee5bb525b19fdca..d205b8de502ecc61de85aa9290925f645c6e8a9c 100644 --- a/core/modules/book/migration_templates/d6_book_settings.yml +++ b/core/modules/book/migration_templates/d6_book_settings.yml @@ -8,6 +8,7 @@ source: - book_child_type - book_block_mode - book_allowed_types + source_module: book process: child_type: book_child_type 'block/navigation/mode': book_block_mode diff --git a/core/modules/book/src/Plugin/migrate/source/d6/Book.php b/core/modules/book/src/Plugin/migrate/source/d6/Book.php index f41bb42dfa749cb4652d1106ce98e250a941aee0..87ae972140fd73a2203bcd184f8a97c708c99fe2 100644 --- a/core/modules/book/src/Plugin/migrate/source/d6/Book.php +++ b/core/modules/book/src/Plugin/migrate/source/d6/Book.php @@ -8,7 +8,8 @@ * Drupal 6 book source. * * @MigrateSource( - * id = "d6_book" + * id = "d6_book", + * source_module = "book" * ) */ class Book extends DrupalSqlBase { diff --git a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php index 93f77a0e3f5ba3f90d1198c333d56864e697e7c8..671947d055b3ae941e967e6c3d5ef510129c1647 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/Comment.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_comment", - * source_provider = "comment" + * source_module = "comment" * ) */ class Comment extends DrupalSqlBase { diff --git a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php index a56fb4dc218052c37cb852175c52fd4e416e3b15..398895b5416b6703b4fedc66a2b1a7d28b0ff298 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariable.php @@ -7,7 +7,8 @@ /** * @MigrateSource( - * id = "d6_comment_variable" + * id = "d6_comment_variable", + * source_module = "comment" * ) */ class CommentVariable extends DrupalSqlBase { diff --git a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php index 0eea68608cf3c4b82dbc317ffe875fc074ca9bb7..0096ecd1857bcfab7f5d51f6d28c35deecf7b860 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php +++ b/core/modules/comment/src/Plugin/migrate/source/d6/CommentVariablePerCommentType.php @@ -4,7 +4,8 @@ /** * @MigrateSource( - * id = "d6_comment_variable_per_comment_type" + * id = "d6_comment_variable_per_comment_type", + * source_module = "comment" * ) */ class CommentVariablePerCommentType extends CommentVariable { diff --git a/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php b/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php index e643eb178c342ab688bda466727a4942990d53ac..4e3f3caa05ab562e537c35b8ac23d9681b53c9a6 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php +++ b/core/modules/comment/src/Plugin/migrate/source/d7/Comment.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d7_comment", - * source_provider = "comment" + * source_module = "comment" * ) */ class Comment extends FieldableEntity { diff --git a/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php b/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php index 2ac7c97a05d6ff1cbf01b54d40606b31d20661e7..a64fc8e06533098abaef26df73317fb9669e7581 100644 --- a/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php +++ b/core/modules/comment/src/Plugin/migrate/source/d7/CommentType.php @@ -11,7 +11,7 @@ * * @MigrateSource( * id = "d7_comment_type", - * source_provider = "comment" + * source_module = "comment" * ) */ class CommentType extends DrupalSqlBase { diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml index 1c99961cc8d284a4765053adbd77024d350f95fa..8f1076744db0b71eaafbe4d99de686759814fd51 100644 --- a/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_system_maintenance.yml @@ -6,6 +6,7 @@ source: plugin: i18n_variable variables: - site_offline_message + source_module: i18n process: langcode: language message: site_offline_message diff --git a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml index 3c80821337c0be807c46c54b7482982800ca34bd..f54e1b868928bfc6d4b2e7b6e2255248f16e34ff 100644 --- a/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_system_site.yml @@ -13,6 +13,7 @@ source: - site_frontpage - site_403 - site_404 + source_module: i18n process: langcode: language name: site_name diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml index d1e5db501b82a932b640d1a9d2250adc45bc18fb..d6e6063948036b884a9717c1aeb16db7399bbcf3 100644 --- a/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_user_mail.yml @@ -19,6 +19,7 @@ source: - user_mail_register_pending_approval_body - user_mail_status_blocked_subject - user_mail_status_blocked_body + source_module: i18n process: langcode: language 'status_activated/subject': diff --git a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml index 36b0fa6c8822bf1483f268400289b4277adb3264..8fc7bf4e7d291562b994a5110aca64e29464d6da 100644 --- a/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml +++ b/core/modules/config_translation/migration_templates/d6_i18n_user_settings.yml @@ -10,6 +10,7 @@ source: - user_email_verification - user_register - anonymous + source_module: i18n process: langcode: language 'notify/status_blocked': user_mail_status_blocked_notify diff --git a/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php b/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php index 2989f967b59ec0bbf1826422f20a7c42499bb909..76321c2234e30ab8260b2b9fad77fa530df3fee5 100644 --- a/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php +++ b/core/modules/config_translation/src/Plugin/migrate/source/d6/I18nProfileField.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_i18n_profile_field", - * source_provider = "i18n" + * source_module = "i18nprofile" * ) */ class I18nProfileField extends DrupalSqlBase { diff --git a/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php b/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php index 0b9f7b3b837fd6adc6a740829e12897baa975118..c361588efc65198a600331f7d178975ccb283c5b 100644 --- a/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php +++ b/core/modules/contact/src/Plugin/migrate/source/ContactCategory.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "contact_category", - * source_provider = "contact" + * source_module = "contact" * ) */ class ContactCategory extends DrupalSqlBase { diff --git a/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php b/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php index 911f3bd9c987e122fdb2cf05b47d76c0a79c69aa..8297be6ae9ce5ac366ba8858be7ce881daa5ba89 100644 --- a/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php +++ b/core/modules/contact/src/Plugin/migrate/source/ContactSettings.php @@ -7,7 +7,7 @@ /** * @MigrateSource( * id = "contact_settings", - * source_provider = "contact" + * source_module = "contact" * ) */ class ContactSettings extends Variable { diff --git a/core/modules/dblog/migration_templates/d6_dblog_settings.yml b/core/modules/dblog/migration_templates/d6_dblog_settings.yml index 64da0a7d13749fd0a92a6deec410091008b1e0c3..a5d746ef5789355bba2ab201ce4c553dfe01a7d9 100644 --- a/core/modules/dblog/migration_templates/d6_dblog_settings.yml +++ b/core/modules/dblog/migration_templates/d6_dblog_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - dblog_row_limit + source_module: dblog process: row_limit: dblog_row_limit destination: diff --git a/core/modules/dblog/migration_templates/d7_dblog_settings.yml b/core/modules/dblog/migration_templates/d7_dblog_settings.yml index e22768fe46839b0bd107c9f14c8528b56cc53ef5..761e9e40c5dee5f6e26c81b97fd92fc2eea555d7 100644 --- a/core/modules/dblog/migration_templates/d7_dblog_settings.yml +++ b/core/modules/dblog/migration_templates/d7_dblog_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - dblog_row_limit + source_module: dblog process: row_limit: dblog_row_limit destination: diff --git a/core/modules/field/src/Plugin/migrate/source/d6/Field.php b/core/modules/field/src/Plugin/migrate/source/d6/Field.php index 7c9e620dd80364a152b20a052d21dce4260f1923..cab02040428abddf1591d75e4478c9506ffd4a9e 100644 --- a/core/modules/field/src/Plugin/migrate/source/d6/Field.php +++ b/core/modules/field/src/Plugin/migrate/source/d6/Field.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_field", - * source_provider = "content" + * source_module = "content" * ) */ class Field extends DrupalSqlBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php index dbea7a8e7335ce230eec490be42e10743072695f..b47f6ab3333311d59206d42338db6e86460e395f 100644 --- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php +++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstance.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_field_instance", - * source_provider = "content" + * source_module = "content" * ) */ class FieldInstance extends DrupalSqlBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php index 21baa9ee211f0d3c4d722aa508328102dc9ecc9b..1db201e3af78d42829eb0e55b965352e952a2cd7 100644 --- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php +++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerFormDisplay.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_field_instance_per_form_display", - * source_provider = "content" + * source_module = "content" * ) */ class FieldInstancePerFormDisplay extends DrupalSqlBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php index 33852d6775b515521121735365b81b6e115ddecd..2fd1e1b86047f3d1afc3ebaca75456df1f8674fc 100644 --- a/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php +++ b/core/modules/field/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php @@ -9,7 +9,7 @@ * * @MigrateSource( * id = "d6_field_instance_per_view_mode", - * source_provider = "content" + * source_module = "content" * ) */ class FieldInstancePerViewMode extends ViewModeBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d7/Field.php b/core/modules/field/src/Plugin/migrate/source/d7/Field.php index c520bbed8bb88e735708754071570cb2685d5f18..9e92619f8e7819c9f7678821b159481405e8d24f 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/Field.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/Field.php @@ -14,7 +14,8 @@ * Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase instead. * * @MigrateSource( - * id = "d7_field" + * id = "d7_field", + * source_module = "field" * ) */ class Field extends DrupalSqlBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php index c816efd4ac03ba69259ee8e21ec75023b634693a..a54b17d9d162b0ca8a3551d83ec2e3e682203a52 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstance.php @@ -15,7 +15,7 @@ * * @MigrateSource( * id = "d7_field_instance", - * source_provider = "field" + * source_module = "field" * ) */ class FieldInstance extends DrupalSqlBase { diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php index 575f61f42fd23525f8fe006598cd4f004fb6df6e..7165f6d21e7fb454e3e159b53d49ed105a586fb8 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerFormDisplay.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d7_field_instance_per_form_display", - * source_provider = "field" + * source_module = "field" * ) */ class FieldInstancePerFormDisplay extends FieldInstance { diff --git a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php index 131c9549414c4cc357a92854a11cf47c5e4ea777..7d5ee81a59fb1787d055fcb8565b48e4c0448e55 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/FieldInstancePerViewMode.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d7_field_instance_per_view_mode", - * source_provider = "field" + * source_module = "field" * ) */ class FieldInstancePerViewMode extends FieldInstance { diff --git a/core/modules/field/src/Plugin/migrate/source/d7/ViewMode.php b/core/modules/field/src/Plugin/migrate/source/d7/ViewMode.php index cd2ce82cf1c5d3fa7a67edacfbc5bdce93e3f5b8..039960a4ed5b9ef1dd4533b9afd6922da1935a45 100644 --- a/core/modules/field/src/Plugin/migrate/source/d7/ViewMode.php +++ b/core/modules/field/src/Plugin/migrate/source/d7/ViewMode.php @@ -7,7 +7,7 @@ * * @MigrateSource( * id = "d7_view_mode", - * source_provider = "field" + * source_module = "field" * ) */ class ViewMode extends FieldInstance { diff --git a/core/modules/file/migration_templates/d6_upload_field.yml b/core/modules/file/migration_templates/d6_upload_field.yml index a919f918ff5f32694e8bfa225bed158c0af3e4e1..ecd095949e0b9c5a5f2126d8798e32d35c2f5810 100644 --- a/core/modules/file/migration_templates/d6_upload_field.yml +++ b/core/modules/file/migration_templates/d6_upload_field.yml @@ -6,7 +6,7 @@ source: # 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 diff --git a/core/modules/file/migration_templates/file_settings.yml b/core/modules/file/migration_templates/file_settings.yml index 36584ccf8e9c423af6d2fcb46ef0ad6daf71c60b..9af18085f332644ac045092f031431408f369a31 100644 --- a/core/modules/file/migration_templates/file_settings.yml +++ b/core/modules/file/migration_templates/file_settings.yml @@ -9,6 +9,7 @@ source: - file_description_type - file_description_length - file_icon_directory + source_module: system process: 'description/type': file_description_type 'description/length': file_description_length diff --git a/core/modules/file/src/Plugin/migrate/source/d6/File.php b/core/modules/file/src/Plugin/migrate/source/d6/File.php index 0564b6b7886c2aeaa81cd91f79831db6deb8dfe1..714dec96358b2846d2ec1d8de9c84ff8475bca50 100644 --- a/core/modules/file/src/Plugin/migrate/source/d6/File.php +++ b/core/modules/file/src/Plugin/migrate/source/d6/File.php @@ -9,7 +9,8 @@ * Drupal 6 file source from database. * * @MigrateSource( - * id = "d6_file" + * id = "d6_file", + * source_module = "system" * ) */ class File extends DrupalSqlBase { diff --git a/core/modules/file/src/Plugin/migrate/source/d6/Upload.php b/core/modules/file/src/Plugin/migrate/source/d6/Upload.php index 4e07a236b5f7bab2bccd3d2e0d4bdff36ad29e5a..475ce61f7aa367caab538743042732a72c0e9e27 100644 --- a/core/modules/file/src/Plugin/migrate/source/d6/Upload.php +++ b/core/modules/file/src/Plugin/migrate/source/d6/Upload.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_upload", - * source_provider = "upload" + * source_module = "upload" * ) */ class Upload extends DrupalSqlBase { diff --git a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php index c1b3345d7611d9d1ab0df653b27665c4248d640c..a0eff928fce546a305c1acc4b847ba91a327212f 100644 --- a/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php +++ b/core/modules/file/src/Plugin/migrate/source/d6/UploadInstance.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_upload_instance", - * source_provider = "upload" + * source_module = "upload" * ) */ class UploadInstance extends DrupalSqlBase { diff --git a/core/modules/file/src/Plugin/migrate/source/d7/File.php b/core/modules/file/src/Plugin/migrate/source/d7/File.php index e418f825bb8ff71d2ace618d7ebc413069991da1..5e88151229ade20e0f5710a10bb80b61574bfec4 100644 --- a/core/modules/file/src/Plugin/migrate/source/d7/File.php +++ b/core/modules/file/src/Plugin/migrate/source/d7/File.php @@ -10,7 +10,8 @@ * Drupal 7 file source from database. * * @MigrateSource( - * id = "d7_file" + * id = "d7_file", + * source_module = "file" * ) */ class File extends DrupalSqlBase { diff --git a/core/modules/filter/migration_templates/d7_filter_settings.yml b/core/modules/filter/migration_templates/d7_filter_settings.yml index d6239fc2e009a352d8e1893703864f7ee42027ca..f3182e36c908572487ca61df00c5cd827d388439 100644 --- a/core/modules/filter/migration_templates/d7_filter_settings.yml +++ b/core/modules/filter/migration_templates/d7_filter_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - filter_fallback_format + source_module: filter process: fallback_format: filter_fallback_format destination: diff --git a/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php index 54b33d48dc74ad1640d463495e4df78b459b93b1..de9ab4c238577299bc5e04130d3828e0174aa11f 100644 --- a/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php +++ b/core/modules/filter/src/Plugin/migrate/source/d6/FilterFormat.php @@ -9,7 +9,8 @@ * Drupal 6 filter source from database. * * @MigrateSource( - * id = "d6_filter_format" + * id = "d6_filter_format", + * source_module = "filter" * ) */ class FilterFormat extends DrupalSqlBase { diff --git a/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php index 55c28111000a43af180765d8a6c01c3544475802..13438f29230da9f4fb05dc9ebb50eeba9fe72560 100644 --- a/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php +++ b/core/modules/filter/src/Plugin/migrate/source/d7/FilterFormat.php @@ -9,7 +9,8 @@ * Drupal 7 filter source from database. * * @MigrateSource( - * id = "d7_filter_format" + * id = "d7_filter_format", + * source_module = "filter" * ) */ class FilterFormat extends DrupalSqlBase { diff --git a/core/modules/forum/migration_templates/d6_forum_settings.yml b/core/modules/forum/migration_templates/d6_forum_settings.yml index 18ba8d403f6d75dd28dafd8ccb9a0f5a30492d9d..406eed383ec3e78e1c4751b96fe85fb9e652b431 100644 --- a/core/modules/forum/migration_templates/d6_forum_settings.yml +++ b/core/modules/forum/migration_templates/d6_forum_settings.yml @@ -11,6 +11,7 @@ source: - forum_block_num_0 - forum_block_num_1 - forum_nav_vocabulary + source_module: forum process: 'block/active/limit': forum_block_num_0 'block/new/limit': forum_block_num_1 diff --git a/core/modules/forum/migration_templates/d7_forum_settings.yml b/core/modules/forum/migration_templates/d7_forum_settings.yml index 086d3e6fc91c7921e2d0cbef78c105f0996473a8..70d690a6e19870dd475efdcbbdf117fc114eefc6 100644 --- a/core/modules/forum/migration_templates/d7_forum_settings.yml +++ b/core/modules/forum/migration_templates/d7_forum_settings.yml @@ -11,6 +11,7 @@ source: - forum_block_num_active - forum_block_num_new - forum_nav_vocabulary + source_module: forum process: 'block/active/limit': forum_block_num_active 'block/new/limit': forum_block_num_new diff --git a/core/modules/image/migration_templates/d7_image_settings.yml b/core/modules/image/migration_templates/d7_image_settings.yml index bfae4d5bb5ec9641952794500b2afc581c4c6c63..354706a55ae399a5c591415c31b9b74d0efc3495 100644 --- a/core/modules/image/migration_templates/d7_image_settings.yml +++ b/core/modules/image/migration_templates/d7_image_settings.yml @@ -8,6 +8,7 @@ source: - allow_insecure_derivatives - suppress_itok_output - image_style_preview_image + source_module: image process: suppress_itok_output: suppress_itok_output allow_insecure_derivatives: allow_insecure_derivatives diff --git a/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php b/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php index aade9abdb4c9c92c9caf2aea45b7efde4ab54543..662648d7abae1193f3897a3be3156c448bb81686 100644 --- a/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php +++ b/core/modules/image/src/Plugin/migrate/source/d6/ImageCachePreset.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d6_imagecache_presets", - * source_provider = "imagecache" + * source_module = "imagecache" * ) */ class ImageCachePreset extends DrupalSqlBase { diff --git a/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php b/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php index dab62f3a9ef2904fb22c5b1ad39cc61a96fb6322..070cc9bfdcd5c34728e1cb8480c15b2fda6b5b7b 100644 --- a/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php +++ b/core/modules/image/src/Plugin/migrate/source/d7/ImageStyles.php @@ -10,7 +10,7 @@ * * @MigrateSource( * id = "d7_image_styles", - * source_provider = "image" + * source_module = "image" * ) */ class ImageStyles extends DrupalSqlBase { diff --git a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml index abc71f68f9d51a6b743589335aad155ca15f8ce7..2530ebcee882095202c51b164c50c5e8b8be184d 100644 --- a/core/modules/language/migration_templates/d6_language_negotiation_settings.yml +++ b/core/modules/language/migration_templates/d6_language_negotiation_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - language_negotiation + source_module: language process: session/parameter: plugin: default_value diff --git a/core/modules/language/migration_templates/d6_language_types.yml b/core/modules/language/migration_templates/d6_language_types.yml index 05ce3001ec46ce58f5e667ec43a20b9fdb4cbba0..52289c5de1f561a8e48cc42f88a1859b4afcad8e 100644 --- a/core/modules/language/migration_templates/d6_language_types.yml +++ b/core/modules/language/migration_templates/d6_language_types.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - language_negotiation + source_module: language process: all: plugin: default_value diff --git a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml index 7759965336da0bc964d5283492d17a3dd4a4d305..7e113b83d273bb7e594ef1ff5cc84dd169c3eeb3 100644 --- a/core/modules/language/migration_templates/d7_language_negotiation_settings.yml +++ b/core/modules/language/migration_templates/d7_language_negotiation_settings.yml @@ -7,6 +7,7 @@ source: variables: - locale_language_negotiation_session_param - locale_language_negotiation_url_part + source_module: locale process: session/parameter: plugin: default_value diff --git a/core/modules/language/migration_templates/d7_language_types.yml b/core/modules/language/migration_templates/d7_language_types.yml index 3a634a2e65f3a17166d832d9823ead97d35a8ab5..10d6ac768b927bf5cfa250a359c1967ca64e3ac1 100644 --- a/core/modules/language/migration_templates/d7_language_types.yml +++ b/core/modules/language/migration_templates/d7_language_types.yml @@ -12,6 +12,7 @@ source: - locale_language_providers_weight_language - locale_language_providers_weight_language_content - locale_language_providers_weight_language_url + source_module: language process: all: plugin: language_types diff --git a/core/modules/language/migration_templates/default_language.yml b/core/modules/language/migration_templates/default_language.yml index 6d7604deed381d80306ef1f20c78379640d1625b..ddb966f5dbebb983e7c9199eafcd0239be9253bd 100644 --- a/core/modules/language/migration_templates/default_language.yml +++ b/core/modules/language/migration_templates/default_language.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - language_default + source_module: locale process: default_langcode: - diff --git a/core/modules/language/src/Plugin/migrate/source/Language.php b/core/modules/language/src/Plugin/migrate/source/Language.php index fa6a1996034fd6fa6c0673084ddbe3dce93bfd39..c2326752239353c88e26cbbbe22a8a4098175f12 100644 --- a/core/modules/language/src/Plugin/migrate/source/Language.php +++ b/core/modules/language/src/Plugin/migrate/source/Language.php @@ -8,7 +8,7 @@ /** * @MigrateSource( * id = "language", - * source_provider = "locale" + * source_module = "locale" * ) */ class Language extends DrupalSqlBase { diff --git a/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php b/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php index ab9ba838137a28e9fbb29375f0498fe425d72987..369238c4fc00a4a73009972134ada72a32705b6c 100644 --- a/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php +++ b/core/modules/language/src/Plugin/migrate/source/d6/LanguageContentSettings.php @@ -10,6 +10,7 @@ * * @MigrateSource( * id = "d6_language_content_settings", + * source_module = "locale" * ) */ class LanguageContentSettings extends DrupalSqlBase { diff --git a/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php b/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php index cb748aec223e8c398fa0510e529bf90da9b9a70c..efe87086d551e848afc9bfc0ee3c2fe76a89c0c6 100644 --- a/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php +++ b/core/modules/language/src/Plugin/migrate/source/d7/LanguageContentSettings.php @@ -10,6 +10,7 @@ * * @MigrateSource( * id = "d7_language_content_settings", + * source_module = "locale" * ) */ class LanguageContentSettings extends DrupalSqlBase { diff --git a/core/modules/locale/migration_templates/locale_settings.yml b/core/modules/locale/migration_templates/locale_settings.yml index 6eebe20455b34ba1324a2e4af1ef7933e2d857f4..dbd7b61b78fd5b2b3d7615bceaeab4edd139745a 100644 --- a/core/modules/locale/migration_templates/locale_settings.yml +++ b/core/modules/locale/migration_templates/locale_settings.yml @@ -8,6 +8,7 @@ source: variables: - locale_cache_strings - locale_js_directory + source_module: locale process: cache_strings: locale_cache_strings 'javascript/directory': locale_js_directory diff --git a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php index 338d3ecef9c2e2a69f65f743c86b55d421c05972..2efb8acfd18e0425e488ac10079b761dab03cffe 100644 --- a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php +++ b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php @@ -11,6 +11,7 @@ * * @MigrateSource( * id = "menu_link", + * source_module = "menu" * ) */ class MenuLink extends DrupalSqlBase { diff --git a/core/modules/menu_ui/migration_templates/menu_settings.yml b/core/modules/menu_ui/migration_templates/menu_settings.yml index dee5f9ee6ce895266d50b5e7fb2d5eaafb356a57..d3b1501cfa87b8fc19ec194c85b6bdc60f456c25 100644 --- a/core/modules/menu_ui/migration_templates/menu_settings.yml +++ b/core/modules/menu_ui/migration_templates/menu_settings.yml @@ -8,6 +8,7 @@ source: plugin: variable variables: - menu_override_parent_selector + source_module: menu process: override_parent_selector: menu_override_parent_selector destination: diff --git a/core/modules/migrate/src/Annotation/MigrateDestination.php b/core/modules/migrate/src/Annotation/MigrateDestination.php index 1fd51d70e5d9218c126c75b3b59ce3899cda9afb..4342ba72e683d5c03192bc819b8807923631a640 100644 --- a/core/modules/migrate/src/Annotation/MigrateDestination.php +++ b/core/modules/migrate/src/Annotation/MigrateDestination.php @@ -43,4 +43,15 @@ class MigrateDestination extends Plugin { */ public $requirements_met = TRUE; + /** + * Identifies the system handling the data the destination plugin will write. + * + * The destination plugin itself determines how the value is used. For + * example, Migrate Drupal's destination plugins expect destination_module to + * be the name of a module that must be installed on the destination. + * + * @var string + */ + public $destination_module; + } diff --git a/core/modules/migrate/src/Annotation/MigrateSource.php b/core/modules/migrate/src/Annotation/MigrateSource.php index 95a243153601eda54891888e55490cd3cd5e1e52..8445ca014a576b13bcc5f6e423b566f7653a9552 100644 --- a/core/modules/migrate/src/Annotation/MigrateSource.php +++ b/core/modules/migrate/src/Annotation/MigrateSource.php @@ -43,16 +43,15 @@ class MigrateSource extends Plugin implements MultipleProviderAnnotationInterfac /** * Identifies the system providing the data the source plugin will read. * - * This can be any type, and the source plugin itself determines how the value - * is used. For example, Migrate Drupal's source plugins expect - * source_provider to be the name of a module that must be installed and - * enabled in the source database. + * The source plugin itself determines how the value is used. For example, + * Migrate Drupal's source plugins expect source_module to be the name of a + * module that must be installed and enabled in the source database. * * @see \Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase::checkRequirements * - * @var mixed + * @var string */ - public $source_provider; + public $source_module; /** * Specifies the minimum version of the source provider. @@ -60,7 +59,7 @@ class MigrateSource extends Plugin implements MultipleProviderAnnotationInterfac * This can be any type, and the source plugin itself determines how it is * used. For example, Migrate Drupal's source plugins expect this to be an * integer representing the minimum installed database schema version of the - * module specified by source_provider. + * module specified by source_module. * * @var mixed */ diff --git a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php index 866e80cbe05345c415a9792e9d8ee3b73c595f6e..a42d70f4f4ca7bf93d0bcca5ee2709473cdeb5b5 100644 --- a/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateDestinationInterface.php @@ -133,4 +133,12 @@ public function supportsRollback(); */ public function rollbackAction(); + /** + * Gets the destination module handling the destination data. + * + * @return string|null + * The destination module or NULL if not found. + */ + public function getDestinationModule(); + } diff --git a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php index ef1785e6fb000603d2f7cce2bed130802c4d6bf9..a40af2e2bc624afc6acd88701e456372ebbd39f3 100644 --- a/core/modules/migrate/src/Plugin/MigrateSourceInterface.php +++ b/core/modules/migrate/src/Plugin/MigrateSourceInterface.php @@ -100,4 +100,12 @@ public function __toString(); */ public function getIds(); + /** + * Gets the source module providing the source data. + * + * @return string|null + * The source module or NULL if not found. + */ + public function getSourceModule(); + } diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Config.php b/core/modules/migrate/src/Plugin/migrate/destination/Config.php index b8db601d14989bdb652b0ed61a6d4889e6afe491..18d78a325e1cde669db74ebbb45c0822d695227e 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/Config.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/Config.php @@ -195,4 +195,26 @@ public function rollback(array $destination_identifier) { } } + /** + * {@inheritdoc} + */ + public function getDestinationModule() { + if (!empty($this->configuration['destination_module'])) { + return $this->configuration['destination_module']; + } + if (!empty($this->pluginDefinition['destination_module'])) { + return $this->pluginDefinition['destination_module']; + } + // Config translations require the config_translation module so set the + // migration provider to 'config_translation'. The corresponding non + // translated configuration is expected to be handled in a separate + // migration. + if (isset($this->configuration['translations'])) { + return 'config_translation'; + } + // Get the module handling this configuration object from the config_name, + // which is of the form . + return !empty($this->configuration['config_name']) ? explode('.', $this->configuration['config_name'], 2)[0] : NULL; + } + } diff --git a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php index 18a95e6bfb757f4b6d1f334f9c809b45e45d5bef..d6c3088817aef62fa8ebceab30271cbbc67ee4d2 100644 --- a/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php +++ b/core/modules/migrate/src/Plugin/migrate/destination/DestinationBase.php @@ -110,4 +110,22 @@ protected function setRollbackAction(array $id_map, $update_action = MigrateIdMa } } + /** + * {@inheritdoc} + */ + public function getDestinationModule() { + if (!empty($this->configuration['destination_module'])) { + return $this->configuration['destination_module']; + } + if (!empty($this->pluginDefinition['destination_module'])) { + return $this->pluginDefinition['destination_module']; + } + if (is_string($this->migration->provider)) { + return $this->migration->provider; + } + else { + return reset($this->migration->provider); + } + } + } diff --git a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php index e35585034e585e453d788709558a28f251f364b9..cef98823befa05b8195514b375b1a0d699aa9b61 100644 --- a/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php +++ b/core/modules/migrate/src/Plugin/migrate/source/SourcePluginBase.php @@ -541,4 +541,17 @@ public function postRollback(MigrateRollbackEvent $event) { $this->saveHighWater(NULL); } + /** + * {@inheritdoc} + */ + public function getSourceModule() { + if (!empty($this->configuration['source_module'])) { + return $this->configuration['source_module']; + } + elseif (!empty($this->pluginDefinition['source_module'])) { + return $this->pluginDefinition['source_module']; + } + return NULL; + } + } diff --git a/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 index ceda6d82e42625f8edddb5e50b6fbe1657592d7e..8edaeccdea2dc375e8acecb270f7435b414fe2c2 100644 --- a/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 @@ -8,7 +8,8 @@ * A simple migrate source for our tests. * * @MigrateSource( - * id = "migrate_external_translated_test" + * id = "migrate_external_translated_test", + * source_module = "migrate_external_translated_test" * ) */ class MigrateExternalTranslatedTestSource extends SourcePluginBase { diff --git a/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php new file mode 100644 index 0000000000000000000000000000000000000000..7c1379a02576508cf7530978ed2e31738a06a067 --- /dev/null +++ b/core/modules/migrate/tests/src/Kernel/Plugin/MigrationProvidersExistTest.php @@ -0,0 +1,64 @@ +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 $plugin_manager */ + $plugin_manager = $this->container->get('plugin.manager.migration'); + // Get all the migrations + $migrations = $plugin_manager->createInstances(array_keys($plugin_manager->getDefinitions())); + // Ensure the test module was enabled. + $this->assertTrue(array_key_exists('migration_provider_test', $migrations)); + $this->assertTrue(array_key_exists('migration_provider_no_annotation', $migrations)); + /** @var \Drupal\migrate\Plugin\Migration $migration */ + foreach ($migrations as $migration) { + $source_module = $migration->getSourcePlugin()->getSourceModule(); + $destination_module = $migration->getDestinationPlugin()->getDestinationModule(); + $migration_id = $migration->getPluginId(); + if ($migration_id == 'migration_provider_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 == 'migration_provider_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])); + } + } + +} diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php index ffff6269cd6596032ccd48521a60ccfebd857253..445441befd603747306cb097a4e45b14c1fa8bc4 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/DrupalSqlBase.php @@ -94,14 +94,14 @@ public static function create(ContainerInterface $container, array $configuratio */ public function checkRequirements() { if ($this->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']]); } } } diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php b/core/modules/migrate_drupal/tests/src/Unit/source/DrupalSqlBaseTest.php index 6dd5925748871e8447f5b05589a8f833e6fbcf8b..ebd9334a2d4fe1feb062da020b7a3750246ff258 100644 --- 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; } diff --git a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php index c87247eb364554043469f4bf409de3d417cd7115..ffe43136fb3383960d5ea708b55227c340e5446c 100644 --- a/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/MigrateUpgradeForm.php @@ -20,670 +20,6 @@ class MigrateUpgradeForm extends ConfirmFormBase { 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', - ], - 'd7_file_private' => [ - '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_term_translation' => [ - 'source_module' => 'i18n', - 'destination_module' => 'taxonomy', - ], - 'd6_taxonomy_vocabulary' => [ - 'source_module' => 'taxonomy', - 'destination_module' => 'taxonomy', - ], - 'd6_taxonomy_vocabulary_translation' => [ - 'source_module' => 'i18n', - '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. * @@ -1054,6 +390,7 @@ public function validateCredentialForm(array &$form, FormStateInterface $form_st } // Store the retrieved migration IDs in form storage. + $form_state->set('version', $version); $form_state->set('migrations', $migration_array); $form_state->set('source_base_path', $form_state->getValue('source_base_path')); $form_state->set('source_private_file_path', $form_state->getValue('source_private_file_path')); @@ -1103,19 +440,24 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { $form['actions']['submit']['#value'] = $this->t('Perform upgrade'); + $version = $form_state->get('version'); + $migrations = $this->getMigrations('migrate_drupal_' . $version, $version); + $table_data = []; - $system_data = []; - foreach ($form_state->get('migrations') as $migration_id => $migration_label) { - // Fetch the system data at the first opportunity. - if (empty($system_data)) { - $system_data = $form_state->get('system_data'); + foreach ($migrations as $migration) { + $migration_id = $migration->getPluginId(); + $source_module = $migration->getSourcePlugin()->getSourceModule(); + if (!$source_module) { + drupal_set_message($this->t('Source module not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); + } + $destination_module = $migration->getDestinationPlugin()->getDestinationModule(); + if (!$destination_module) { + drupal_set_message($this->t('Destination module not found for @migration_id.', ['@migration_id' => $migration_id]), 'error'); } - // Handle derivatives. - list($migration_id,) = explode(':', $migration_id, 2); - $source_module = $this->moduleUpgradePaths[$migration_id]['source_module']; - $destination_module = $this->moduleUpgradePaths[$migration_id]['destination_module']; - $table_data[$source_module][$destination_module][$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 // module names. @@ -1123,6 +465,9 @@ public function buildConfirmForm(array $form, FormStateInterface $form_state) { foreach ($table_data as $source_module => $destination_module_info) { ksort($table_data[$source_module]); } + + // Fetch the system data at the first opportunity. + $system_data = $form_state->get('system_data'); $unmigrated_source_modules = array_diff_key($system_data['module'], $table_data); // Missing migrations. diff --git a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php index 4aea3f1d093b5b8ebe3d2582815682befbae465b..3846bd85c0615e5d1d853b4208811169b270fbb7 100644 --- a/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/src/Tests/MigrateUpgradeTestBase.php @@ -44,6 +44,7 @@ abstract class MigrateUpgradeTestBase extends WebTestBase { 'book', 'forum', 'statistics', + 'modules_available_test', ]; /** @@ -149,6 +150,30 @@ public function testMigrateUpgrade() { $this->drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); + // 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 module error messages. + $this->container->get('module_installer')->uninstall(['modules_available_test'], TRUE); + + // Restart the upgrade process. + $this->drupalGet('/upgrade'); + $this->assertText('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the online documentation for Drupal site upgrades for more detailed information.'); + + $this->drupalPostForm(NULL, [], t('Continue')); + $this->assertText('Provide credentials for the database of the Drupal site you want to upgrade.'); + $this->assertFieldByName('mysql[host]'); + + $this->drupalPostForm(NULL, $edits, t('Review upgrade')); + $this->assertResponse(200); + $this->assertText('Are you sure?'); + // 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')); + // Check for any missing module errors. $this->drupalPostForm(NULL, [], t('Perform upgrade')); $this->assertText(t('Congratulations, you upgraded Drupal!')); diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_provider_test.info.yml b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_provider_test.info.yml new file mode 100644 index 0000000000000000000000000000000000000000..49b7dce9b5fb25a5e1fcde6c37ff9eb2103315ab --- /dev/null +++ b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_provider_test.info.yml @@ -0,0 +1,6 @@ +name: 'Migration provider missing' +type: module +description: 'Add a migration missing a source and destination migration provider and a source plugin missing a migration provider.' +package: Testing +version: VERSION +core: 8.x diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_no_annotation.yml b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_no_annotation.yml new file mode 100644 index 0000000000000000000000000000000000000000..bdc906660b697ad11fb3d57e1c47b864b953be1e --- /dev/null +++ b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_no_annotation.yml @@ -0,0 +1,13 @@ +id: migration_provider_no_annotation +label: Missing source annotation +migration_tags: + - Drupal 6 + - Drupal 7 +source: +# Test plugin without a source_module annotation + plugin: no_source_module +process: + message: site_offline_message +destination: + plugin: config + config_name: test.settings diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_test.yml b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_test.yml new file mode 100644 index 0000000000000000000000000000000000000000..d3afc6653985c245f689b3fa7532f7c846f9e557 --- /dev/null +++ b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/migration_templates/migration_provider_test.yml @@ -0,0 +1,16 @@ +id: migration_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: \ No newline at end of file diff --git a/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/src/Plugin/migrate/source/NoSourceModule.php b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/src/Plugin/migrate/source/NoSourceModule.php new file mode 100644 index 0000000000000000000000000000000000000000..0fc3063bb66a8a7a38725d4c00532c91a8268595 --- /dev/null +++ b/core/modules/migrate_drupal_ui/tests/modules/migration_provider_test/src/Plugin/migrate/source/NoSourceModule.php @@ -0,0 +1,31 @@ +drupalPostForm(NULL, $edits, t('Review upgrade')); $this->assertResponse(200); $this->assertText('Are you sure?'); + // Ensure we get errors about missing modules. + $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_no_annotation.')); + $this->assertSession()->pageTextContains(t('Source module not found for migration_provider_test.')); + $this->assertSession()->pageTextContains(t('Destination module not found for migration_provider_test')); + + // Uninstall the module causing the missing module error messages. + $this->container->get('module_installer')->uninstall(['migration_provider_test'], TRUE); + + // Restart the upgrade process. + $this->drupalGet('/upgrade'); + $this->assertSession()->pageTextContains('Upgrade a site by importing it into a clean and empty new install of Drupal 8. You will lose any existing configuration once you import your site into it. See the online documentation for Drupal site upgrades for more detailed information.'); + + $this->drupalPostForm(NULL, [], t('Continue')); + $this->assertSession()->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.'); + $this->assertSession()->fieldExists('mysql[host]'); + + $this->drupalPostForm(NULL, $edits, t('Review upgrade')); + $this->assertSession()->statusCodeEquals(200); + $this->assertSession()->pageTextContains('Are you sure?'); + // Ensure there are no errors about the missing modules from the test module. + $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_no_annotation.')); + $this->assertSession()->pageTextNotContains(t('Source module not found for migration_provider_test.')); + $this->assertSession()->pageTextNotContains(t('Destination module not found for migration_provider_test')); + // Ensure there are no errors about any other missing migration providers. + $this->assertSession()->pageTextNotContains(t('module not found')); $this->drupalPostForm(NULL, [], t('Perform upgrade')); $this->assertText(t('Congratulations, you upgraded Drupal!')); diff --git a/core/modules/node/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml index 17b08573f55093a412c070daa2a3f06301cb9ea6..98b09fbc4b227e0fd7fec819edfb6f2a2eb583dc 100644 --- a/core/modules/node/migration_templates/d6_node_settings.yml +++ b/core/modules/node/migration_templates/d6_node_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - node_admin_theme + source_module: node process: use_admin_theme: node_admin_theme destination: diff --git a/core/modules/node/migration_templates/d6_node_translation.yml b/core/modules/node/migration_templates/d6_node_translation.yml index 3eb06e8a7d7a364ee5ee88c7704227a541685ed8..4bf36da736ab08ec2b2049402e7445c1ac84be01 100644 --- a/core/modules/node/migration_templates/d6_node_translation.yml +++ b/core/modules/node/migration_templates/d6_node_translation.yml @@ -6,6 +6,7 @@ deriver: Drupal\node\Plugin\migrate\D6NodeDeriver source: plugin: d6_node translations: true + source_module: translation process: # If you are using this file to build a custom migration consider removing # the nid field to allow incremental migrations. @@ -41,6 +42,7 @@ process: destination: plugin: entity:node translations: true + destination_module: content_translation migration_dependencies: required: - d6_user @@ -52,4 +54,3 @@ migration_dependencies: - d6_field_instance_widget_settings - d6_field_formatter_settings - d6_upload_field_instance -provider: migrate_drupal diff --git a/core/modules/node/migration_templates/d7_node_settings.yml b/core/modules/node/migration_templates/d7_node_settings.yml index 04617544c9dd127e230ee3ccb4e263af608eb7fe..46eec7c035f1dcf837c7c76db9c245717771b827 100644 --- a/core/modules/node/migration_templates/d7_node_settings.yml +++ b/core/modules/node/migration_templates/d7_node_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - node_admin_theme + source_module: node process: use_admin_theme: node_admin_theme destination: diff --git a/core/modules/node/migration_templates/d7_node_translation.yml b/core/modules/node/migration_templates/d7_node_translation.yml index 11dfbb792a1fa243e7d6b259e32de906fcb97e5c..856f34505e3a61208e19c6261a06e28465d372f1 100644 --- a/core/modules/node/migration_templates/d7_node_translation.yml +++ b/core/modules/node/migration_templates/d7_node_translation.yml @@ -7,6 +7,7 @@ deriver: Drupal\node\Plugin\migrate\D7NodeDeriver source: plugin: d7_node translations: true + source_module: translation process: # If you are using this file to build a custom migration consider removing # the nid field to allow incremental migrations. @@ -32,6 +33,7 @@ destination: translations: true content_translation_update_definitions: - node + destination_module: content_translation migration_dependencies: required: - d7_user @@ -39,4 +41,3 @@ migration_dependencies: - language optional: - d7_field_instance -provider: migrate_drupal diff --git a/core/modules/node/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php index ffa26595f1c1960fa95dbd20a11e12221b644353..1dc81f9c6e90c677d68003389de9dbe1f5a67f91 100644 --- a/core/modules/node/src/Plugin/migrate/source/d6/Node.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php @@ -15,7 +15,9 @@ * Drupal 6 node source from database. * * @MigrateSource( - * id = "d6_node" + * id = "d6_node", + * source_module = "node" + * * ) */ class Node extends DrupalSqlBase { diff --git a/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php index f3296c234d52f7688bd001216f661ea003336a06..a0103fc00f5c3964b033cfe0b20b8de25bb328da 100644 --- a/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php @@ -7,7 +7,8 @@ * Drupal 6 node revision source from database. * * @MigrateSource( - * id = "d6_node_revision" + * id = "d6_node_revision", + * source_module = "node" * ) */ class NodeRevision extends Node { diff --git a/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php index b5a66ce7e23a6b4e1b894b95df5ef906bce3137a..5ec0aaeca4b284920a3b4d0e2a5fda575df86d73 100644 --- a/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php @@ -9,7 +9,8 @@ * Drupal 6 Node types source from database. * * @MigrateSource( - * id = "d6_node_type" + * id = "d6_node_type", + * source_module = "node" * ) */ class NodeType extends DrupalSqlBase { diff --git a/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php index b5a6d4d98258de72615ef360fa03165aee359a13..434007a0a20a6187e807cd1ab136682fb11cd02c 100644 --- 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 { diff --git a/core/modules/node/src/Plugin/migrate/source/d7/Node.php b/core/modules/node/src/Plugin/migrate/source/d7/Node.php index 451905cd96ac68a3b3425b3881e5788ef3ef6f65..1a9037e7a00a4f0b6772815117cd6ad0bb96a800 100644 --- 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 { diff --git a/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php b/core/modules/node/src/Plugin/migrate/source/d7/NodeRevision.php index 89c1bcca5e7f9424c85a17344ca5864272a1bffe..67071a72fc9bb1be1c176e32fd64a57ef597657e 100644 --- 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 { diff --git a/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php b/core/modules/node/src/Plugin/migrate/source/d7/NodeType.php index a0b2273b8071138d55645f1253aa1bf62305d8b2..7f8290f24586c6e7cd76fb5ab07d384e43256110 100644 --- 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 { diff --git a/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php b/core/modules/path/src/Plugin/migrate/source/d6/UrlAlias.php index 3e1f624d270849acec38a2730f28d3bc701cb818..c01d364733f3ab4a693a75b48be8f6633690c2ec 100644 --- 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 { diff --git a/core/modules/path/src/Plugin/migrate/source/d7/UrlAlias.php b/core/modules/path/src/Plugin/migrate/source/d7/UrlAlias.php index eaaea166085649213d34cdee3c22a90657f1db65..58405fdf192b92df62b97adbd7609d8c4642c217 100644 --- 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 { diff --git a/core/modules/search/migration_templates/d6_search_settings.yml b/core/modules/search/migration_templates/d6_search_settings.yml index 28f860060a8668dd128c3edcf256a0b524797c38..1500a3f06e48180bd3c4408a02d654c60b9f32c8 100644 --- a/core/modules/search/migration_templates/d6_search_settings.yml +++ b/core/modules/search/migration_templates/d6_search_settings.yml @@ -10,6 +10,7 @@ source: - minimum_word_size - overlap_cjk - search_cron_limit + source_module: search process: 'index/minimum_word_size': minimum_word_size 'index/overlap_cjk': overlap_cjk diff --git a/core/modules/search/migration_templates/d7_search_settings.yml b/core/modules/search/migration_templates/d7_search_settings.yml index 57db8b9456609efe0236b1d6558973ca33296ead..74f0ef719ed03f9dddad3b6cafa075f560fbb07f 100644 --- a/core/modules/search/migration_templates/d7_search_settings.yml +++ b/core/modules/search/migration_templates/d7_search_settings.yml @@ -13,6 +13,7 @@ source: - search_tag_weights - search_and_or_limit - search_default_module + source_module: search process: 'index/minimum_word_size': minimum_word_size 'index/overlap_cjk': overlap_cjk diff --git a/core/modules/search/migration_templates/search_page.yml b/core/modules/search/migration_templates/search_page.yml index 8ddc02acfbca6b236ee0cda6fe11f22621378d3d..fc9b410afead9f19ec77c4f0053934db3d5ff6f1 100644 --- a/core/modules/search/migration_templates/search_page.yml +++ b/core/modules/search/migration_templates/search_page.yml @@ -16,6 +16,7 @@ source: id: node_search path: node plugin: node_search + source_module: search process: id: 'constants/id' path: 'constants/path' diff --git a/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php b/core/modules/shortcut/src/Plugin/migrate/source/d7/Shortcut.php index 444c38feb921c1e79c39b2822620a993c349c282..ac2c63f29de19a3bb162a5993f6d17986487657f 100644 --- 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 { diff --git a/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php b/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSet.php index a088ca8efb18cda2badbb64580c218fa140c2814..7a3ed8ac531f46cbf39ce7170d8a00a441070a97 100644 --- 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 { diff --git a/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php b/core/modules/shortcut/src/Plugin/migrate/source/d7/ShortcutSetUsers.php index b86dccde1686616d370566666310437cfb39d42b..c4d54e9fd000e3be57961c3804f19dadbc9a4bdc 100644 --- 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 { diff --git a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml index c9eedbb265e1e2be754d0ec6921c73ccb37ded0d..ec5e2f262ba5cc1b0b132552cb789062072f3800 100644 --- a/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml +++ b/core/modules/simpletest/migration_templates/d6_simpletest_settings.yml @@ -10,6 +10,7 @@ source: - simpletest_httpauth_password - simpletest_httpauth_username - simpletest_verbose + source_module: simpletest process: clear_results: simpletest_clear_results 'httpauth/method': simpletest_httpauth_method diff --git a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml index b77f76a3291cf2037e77cd163224acbf395f09a9..f5e9357466ba53fd7390988a654901487213ac56 100644 --- a/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml +++ b/core/modules/simpletest/migration_templates/d7_simpletest_settings.yml @@ -10,6 +10,7 @@ source: - simpletest_httpauth_password - simpletest_httpauth_username - simpletest_verbose + source_module: simpletest process: clear_results: simpletest_clear_results 'httpauth/method': simpletest_httpauth_method diff --git a/core/modules/statistics/migration_templates/statistics_settings.yml b/core/modules/statistics/migration_templates/statistics_settings.yml index 1f5b5bbd0e12a3600c36f174e2d8e3611f146bd9..429d7e11c99c44b1bbcf4700bc6df93d47eef86b 100644 --- a/core/modules/statistics/migration_templates/statistics_settings.yml +++ b/core/modules/statistics/migration_templates/statistics_settings.yml @@ -9,6 +9,7 @@ source: - statistics_enable_access_log - statistics_flush_accesslog_timer - statistics_count_content_views + source_module: statistics process: 'count_content_views': statistics_count_content_views destination: diff --git a/core/modules/syslog/migration_templates/d6_syslog_settings.yml b/core/modules/syslog/migration_templates/d6_syslog_settings.yml index 86a7017d003d84142bdb286e64a5e6811c4b6eb0..5426271b4aa082e9759e567714b378ae09ff5665 100644 --- a/core/modules/syslog/migration_templates/d6_syslog_settings.yml +++ b/core/modules/syslog/migration_templates/d6_syslog_settings.yml @@ -7,6 +7,7 @@ source: variables: - syslog_identity - syslog_facility + source_module: syslog process: identity: syslog_identity facility: syslog_facility diff --git a/core/modules/syslog/migration_templates/d7_syslog_settings.yml b/core/modules/syslog/migration_templates/d7_syslog_settings.yml index 40005722261b14009b032952b9e0240863810350..357b38a63bf3923e2ba70ff5fff7b684b4a04261 100644 --- a/core/modules/syslog/migration_templates/d7_syslog_settings.yml +++ b/core/modules/syslog/migration_templates/d7_syslog_settings.yml @@ -8,6 +8,7 @@ source: - syslog_facility - syslog_format - syslog_identity + source_module: syslog process: facility: syslog_facility format: syslog_format diff --git a/core/modules/system/migration_templates/d6_date_formats.yml b/core/modules/system/migration_templates/d6_date_formats.yml index 71257d4fc53fa2751e003df8c9db941eba8c5fa5..b28128015c82d78e55aa0bfc4756721d9009ec23 100644 --- a/core/modules/system/migration_templates/d6_date_formats.yml +++ b/core/modules/system/migration_templates/d6_date_formats.yml @@ -8,6 +8,7 @@ source: - date_format_long - date_format_medium - date_format_short + source_module: system process: id: plugin: static_map diff --git a/core/modules/system/migration_templates/d6_system_cron.yml b/core/modules/system/migration_templates/d6_system_cron.yml index 7dd3a2bcec570cc4ca7af45cc45c9b313800a82d..bf1f6b331d06451a8d419622d2cad1e909000fdd 100644 --- a/core/modules/system/migration_templates/d6_system_cron.yml +++ b/core/modules/system/migration_templates/d6_system_cron.yml @@ -8,6 +8,7 @@ source: - cron_threshold_warning - cron_threshold_error - cron_last + source_module: system process: 'threshold/requirements_warning': cron_threshold_warning 'threshold/requirements_error': cron_threshold_error diff --git a/core/modules/system/migration_templates/d6_system_date.yml b/core/modules/system/migration_templates/d6_system_date.yml index 25f6728ae1e374f74a67b3aa0ed128bd9231d5d1..7da96c34882174ea1c3b9ab0fdc50cd28795b4f3 100644 --- a/core/modules/system/migration_templates/d6_system_date.yml +++ b/core/modules/system/migration_templates/d6_system_date.yml @@ -8,6 +8,7 @@ source: - configurable_timezones - date_first_day - date_default_timezone + source_module: system process: 'timezone/user/configurable': configurable_timezones first_day: date_first_day diff --git a/core/modules/system/migration_templates/d6_system_file.yml b/core/modules/system/migration_templates/d6_system_file.yml index 60cd61600b7badc5779411f7f0c6377fba6bbc31..902b0e4477f7d14979f1e4b6d241d80dea189b33 100644 --- a/core/modules/system/migration_templates/d6_system_file.yml +++ b/core/modules/system/migration_templates/d6_system_file.yml @@ -7,6 +7,7 @@ source: variables: - file_directory_temp - allow_insecure_uploads + source_module: system process: 'path/temporary': file_directory_temp allow_insecure_uploads: diff --git a/core/modules/system/migration_templates/d6_system_performance.yml b/core/modules/system/migration_templates/d6_system_performance.yml index 70a03d61e75f2f49df1bb63e745170937009903d..87811c36b8774326c680813bfec2855f7915ecb1 100644 --- a/core/modules/system/migration_templates/d6_system_performance.yml +++ b/core/modules/system/migration_templates/d6_system_performance.yml @@ -10,6 +10,7 @@ source: - cache_lifetime - cache - page_compression + source_module: system process: 'css/preprocess': preprocess_css 'js/preprocess': preprocess_js diff --git a/core/modules/system/migration_templates/d7_global_theme_settings.yml b/core/modules/system/migration_templates/d7_global_theme_settings.yml index 42c5177d43bc14398cc2465304b56abfa20b559d..9b5ff83f5a3bed23124635d41a6dcb1841c678d1 100644 --- a/core/modules/system/migration_templates/d7_global_theme_settings.yml +++ b/core/modules/system/migration_templates/d7_global_theme_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - theme_settings + source_module: system process: 'features/logo': theme_settings/toggle_logo 'features/name': theme_settings/toggle_name diff --git a/core/modules/system/migration_templates/d7_system_authorize.yml b/core/modules/system/migration_templates/d7_system_authorize.yml index 420497b8d38c32b60e3e8460b581bc214562e7f7..780499e7da59d244b0847c5d59f37767fe2c6af8 100644 --- a/core/modules/system/migration_templates/d7_system_authorize.yml +++ b/core/modules/system/migration_templates/d7_system_authorize.yml @@ -5,6 +5,7 @@ source: plugin: variable variables: - authorize_filetransfer_default + source_module: system process: filetransfer_default: authorize_filetransfer_default destination: diff --git a/core/modules/system/migration_templates/d7_system_cron.yml b/core/modules/system/migration_templates/d7_system_cron.yml index a603af3e913254192b5831e6490447ca27ed94a2..55021c9de9010ef913e918af5308d426066c189d 100644 --- a/core/modules/system/migration_templates/d7_system_cron.yml +++ b/core/modules/system/migration_templates/d7_system_cron.yml @@ -7,6 +7,7 @@ source: variables: - cron_threshold_warning - cron_threshold_error + source_module: system process: 'threshold/requirements_warning': cron_threshold_warning 'threshold/requirements_error': cron_threshold_error diff --git a/core/modules/system/migration_templates/d7_system_date.yml b/core/modules/system/migration_templates/d7_system_date.yml index b380c897d7891c920b013458c2fd0d36b3f16149..9722a0353f768190087c176120b8531fa527c504 100644 --- a/core/modules/system/migration_templates/d7_system_date.yml +++ b/core/modules/system/migration_templates/d7_system_date.yml @@ -10,6 +10,7 @@ source: - configurable_timezones - empty_timezone_message - user_default_timezone + source_module: system process: 'country/default': site_default_country first_day: date_first_day diff --git a/core/modules/system/migration_templates/d7_system_file.yml b/core/modules/system/migration_templates/d7_system_file.yml index 2295e0e10c4f9d871bc6e2f1ec1c5d1b0ef0a1d8..9652cb0e51606c30a211e825ca0e31670824138b 100644 --- a/core/modules/system/migration_templates/d7_system_file.yml +++ b/core/modules/system/migration_templates/d7_system_file.yml @@ -7,6 +7,7 @@ source: variables: - allow_insecure_uploads - file_temporary_path + source_module: system process: allow_insecure_uploads: plugin: static_map diff --git a/core/modules/system/migration_templates/d7_system_mail.yml b/core/modules/system/migration_templates/d7_system_mail.yml index d4a569cf8c6e8e925d580de4221343c9c1eda2c4..bc9577e3f9d3bb167e889c12b4054fc6a18f4eeb 100644 --- a/core/modules/system/migration_templates/d7_system_mail.yml +++ b/core/modules/system/migration_templates/d7_system_mail.yml @@ -5,6 +5,7 @@ source: plugin: variable variables: - mail_system + source_module: system process: 'interface/default': plugin: static_map diff --git a/core/modules/system/migration_templates/d7_system_performance.yml b/core/modules/system/migration_templates/d7_system_performance.yml index abeb008674c4778b98caa30ac59650f3236d04de..0f28dbfc6db2a5f6e946e6a81f544f5f52f8d8a9 100644 --- a/core/modules/system/migration_templates/d7_system_performance.yml +++ b/core/modules/system/migration_templates/d7_system_performance.yml @@ -9,6 +9,7 @@ source: - preprocess_js - cache_lifetime - page_compression + source_module: system process: 'css/preprocess': preprocess_css 'js/preprocess': preprocess_js diff --git a/core/modules/system/migration_templates/system_image.yml b/core/modules/system/migration_templates/system_image.yml index 7bb16b1b78e9aac4fd2bfbd32104a0dbd9d3a030..1f5612f7663c7a76597fbac32f2a69aec11553cd 100644 --- a/core/modules/system/migration_templates/system_image.yml +++ b/core/modules/system/migration_templates/system_image.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - image_toolkit + source_module: system process: toolkit: image_toolkit destination: diff --git a/core/modules/system/migration_templates/system_image_gd.yml b/core/modules/system/migration_templates/system_image_gd.yml index 685116eeb6f02ecbeca1ed5e30f13b6a3cd7bac0..28e0ab71ee5582966bad7ed5ec36d81dd2b6b715 100644 --- a/core/modules/system/migration_templates/system_image_gd.yml +++ b/core/modules/system/migration_templates/system_image_gd.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - image_jpeg_quality + source_module: system process: jpeg_quality: image_jpeg_quality destination: diff --git a/core/modules/system/migration_templates/system_logging.yml b/core/modules/system/migration_templates/system_logging.yml index c1e81141c76fe7e7d54eafbaa78746f4454d0f9b..eea3473bf8da595fa9178f656ec85c4ff0c745e1 100644 --- a/core/modules/system/migration_templates/system_logging.yml +++ b/core/modules/system/migration_templates/system_logging.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - error_level + source_module: system process: error_level: plugin: static_map diff --git a/core/modules/system/migration_templates/system_maintenance.yml b/core/modules/system/migration_templates/system_maintenance.yml index b9f6c3482077cf7f12376f1d02a195909cb8e543..183fa108351985a168c8ec04cecb5b544159dc0d 100644 --- a/core/modules/system/migration_templates/system_maintenance.yml +++ b/core/modules/system/migration_templates/system_maintenance.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - site_offline_message + source_module: system process: message: site_offline_message destination: diff --git a/core/modules/system/migration_templates/system_rss.yml b/core/modules/system/migration_templates/system_rss.yml index 92ce45a6173f97d758658f8e2a0c9e4a49990de6..d6ff5bc4bf438de24d4a72ff23188a4b8da372cb 100644 --- a/core/modules/system/migration_templates/system_rss.yml +++ b/core/modules/system/migration_templates/system_rss.yml @@ -8,6 +8,7 @@ source: variables: - feed_default_items - feed_item_length + source_module: system process: 'items/limit': feed_default_items 'items/view_mode': feed_item_length diff --git a/core/modules/system/migration_templates/system_site.yml b/core/modules/system/migration_templates/system_site.yml index c8fd84906749a6a76941404aebe9d9196bf16592..397823c2b5ef618ee9c50bca209723978d6fc169 100644 --- a/core/modules/system/migration_templates/system_site.yml +++ b/core/modules/system/migration_templates/system_site.yml @@ -16,6 +16,7 @@ source: - site_404 - drupal_weight_select_max - admin_compact_mode + source_module: system process: name: site_name mail: site_mail diff --git a/core/modules/system/src/Plugin/migrate/source/Menu.php b/core/modules/system/src/Plugin/migrate/source/Menu.php index c55bc4bb7fd44473374a912881835058376e9267..a97878fa4af13edaa6b2774b950c445fc5370f66 100644 --- 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 { diff --git a/core/modules/system/src/Plugin/migrate/source/d7/ThemeSettings.php b/core/modules/system/src/Plugin/migrate/source/d7/ThemeSettings.php index 5561a9a53fd3f19a02f44dfa08d5d0909672bf58..6ae17beabeccc0754caaada5fda3e5a687a8b14a 100644 --- 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 { diff --git a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml index c20372c690a592ca872c0dbbf10721fbbf4aeab7..28505db58ae0055a1ae312134c68377a279dc8ea 100644 --- a/core/modules/taxonomy/migration_templates/taxonomy_settings.yml +++ b/core/modules/taxonomy/migration_templates/taxonomy_settings.yml @@ -8,6 +8,7 @@ source: variables: - taxonomy_override_selector - taxonomy_terms_per_page_admin + source_module: taxonomy process: override_selector: taxonomy_override_selector terms_per_page_admin: taxonomy_terms_per_page_admin diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/Term.php b/core/modules/taxonomy/src/Plugin/migrate/source/Term.php index 53ca632c9cddad1388058506c488965c6d8aa4e8..9c7443b40f3e696578aa9ae408615d6c0023adea 100644 --- 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. diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Term.php index 9170cd8ae3ba92fdfbadfe55a6e977b741ddb942..d43ed166d295d26c3e35f49a842421b15e91cf6e 100644 --- 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 { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNode.php index 2b1c806f2b2be49085d6a2885fa8d02a448e8974..4171cceb4f32dd4a0ddde459c11c9643c03fb091 100644 --- 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 { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php index 91c133bc6ca4b6ff964c0973c42752408dc9ba3c..96d30d48af767695a92cc35659d40272120e3355 100644 --- a/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php +++ b/core/modules/taxonomy/src/Plugin/migrate/source/d6/TermNodeRevision.php @@ -6,7 +6,8 @@ * Source returning tids from the term_node table for the non-current revision. * * @MigrateSource( - * id = "d6_term_node_revision" + * id = "d6_term_node_revision", + * source_module = "taxonomy" * ) */ class TermNodeRevision extends TermNode { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/Vocabulary.php index 714fa933104a3f51a8c361faab69aabe1f515cb4..a1c2f6912e4e5f57866b3adec71a1f3620d78b92 100644 --- 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 { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyPerType.php index 40a0094afe2d63d5ced6484f00befa3c2018fb63..ba736ea8ac8ebeac7dac8a1c8300701222ed8fc9 100644 --- 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 { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyTranslation.php b/core/modules/taxonomy/src/Plugin/migrate/source/d6/VocabularyTranslation.php index a6edd05e94cd18c4469266efc9b02eef1ce92d78..c8f4ef85de03d36ace7bdad8fff007b9c97ca030 100644 --- 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 = "i18ntaxonomy" * ) */ class VocabularyTranslation extends DrupalSqlBase { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Term.php index 518b9f7a412436fe5abaf45cc89a69c36fc84bf9..a9711a1b66a05101af556683823712e1afeb93f4 100644 --- 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 { diff --git a/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php b/core/modules/taxonomy/src/Plugin/migrate/source/d7/Vocabulary.php index 31103a8be13321b4f3378cf4e2acdfa30706f4d4..cc1afa90352ea34014a872a7b5ef8b843e424a34 100644 --- 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 { diff --git a/core/modules/text/migration_templates/text_settings.yml b/core/modules/text/migration_templates/text_settings.yml index 45d426da353219abdaf8fc9feb38ca8202c9fd4a..a38de856d7e9b8d3aa268a86239dc129576e699e 100644 --- a/core/modules/text/migration_templates/text_settings.yml +++ b/core/modules/text/migration_templates/text_settings.yml @@ -7,6 +7,7 @@ source: plugin: variable variables: - teaser_length + source_module: text process: default_summary_length: teaser_length destination: diff --git a/core/modules/tracker/migration_templates/d7_tracker_settings.yml b/core/modules/tracker/migration_templates/d7_tracker_settings.yml index ce06cbd84a8ac3196e18d6ea22a23d6ab36ea58b..ac61d7dbe2d3d10232634ae4b5d83b5c758f942f 100644 --- a/core/modules/tracker/migration_templates/d7_tracker_settings.yml +++ b/core/modules/tracker/migration_templates/d7_tracker_settings.yml @@ -6,6 +6,7 @@ source: plugin: variable variables: - tracker_batch_size + source_module: tracker process: cron_index_limit: tracker_batch_size destination: diff --git a/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerNode.php b/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerNode.php index ffdc5cd332b59947d6d664343e88a655fc50bebe..2805b7d7544c430d6a5001f6ec03f2864785d9cb 100644 --- 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 { diff --git a/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerUser.php b/core/modules/tracker/src/Plugin/migrate/source/d7/TrackerUser.php index 9ce3ff3166e3cf64d697f69126627866138da115..4991dbe2211c26140d46dff8cd74eb04b2192f7e 100644 --- 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 { diff --git a/core/modules/update/migration_templates/update_settings.yml b/core/modules/update/migration_templates/update_settings.yml index ad2247235594ee56b5a56bc721c4d9871ee64782..a7adfd7dc60dc678d42bbe94f83e6e38a1adbecf 100644 --- a/core/modules/update/migration_templates/update_settings.yml +++ b/core/modules/update/migration_templates/update_settings.yml @@ -11,6 +11,7 @@ source: - update_notification_threshold - update_notify_emails - update_check_frequency + source_module: update process: 'fetch/max_attempts': update_max_fetch_attempts 'fetch/url': update_fetch_url diff --git a/core/modules/user/migration_templates/d6_user_mail.yml b/core/modules/user/migration_templates/d6_user_mail.yml index b06b6ea214eb908ad2730e3d1e6ce74bcfee1040..9b25b943f7415e2f47b21fc6a304aae797bd4c74 100644 --- a/core/modules/user/migration_templates/d6_user_mail.yml +++ b/core/modules/user/migration_templates/d6_user_mail.yml @@ -19,6 +19,7 @@ source: - user_mail_register_pending_approval_body - user_mail_status_blocked_subject - user_mail_status_blocked_body + source_module: user process: 'status_activated/subject': plugin: convert_tokens diff --git a/core/modules/user/migration_templates/d6_user_settings.yml b/core/modules/user/migration_templates/d6_user_settings.yml index 6e25ece3761f962d031eee17174c99c986963662..2dfa946fcba9e2728c252dc0ec73924507c7312b 100644 --- a/core/modules/user/migration_templates/d6_user_settings.yml +++ b/core/modules/user/migration_templates/d6_user_settings.yml @@ -10,6 +10,7 @@ source: - user_email_verification - user_register - anonymous + source_module: user process: 'notify/status_blocked': user_mail_status_blocked_notify 'notify/status_activated': user_mail_status_activated_notify diff --git a/core/modules/user/migration_templates/d7_user_flood.yml b/core/modules/user/migration_templates/d7_user_flood.yml index ae00ce08cf2dd041bd4a37be0d6319d5d66f56c9..db08753451b9694d2b001e447cad5f43d226931e 100644 --- a/core/modules/user/migration_templates/d7_user_flood.yml +++ b/core/modules/user/migration_templates/d7_user_flood.yml @@ -10,6 +10,7 @@ source: - user_failed_login_ip_window - user_failed_login_user_window - user_failed_login_user_limit + source_module: user process: uid_only: user_failed_login_identifier_uid_only ip_limit: user_failed_login_ip_limit diff --git a/core/modules/user/migration_templates/d7_user_mail.yml b/core/modules/user/migration_templates/d7_user_mail.yml index 0c5e74c32bfb8dae81709c9506a920e4373bbf11..81051ef47f39c4a8d530f1b940445c6d7a333260 100644 --- a/core/modules/user/migration_templates/d7_user_mail.yml +++ b/core/modules/user/migration_templates/d7_user_mail.yml @@ -19,6 +19,7 @@ source: - user_mail_register_pending_approval_body - user_mail_status_blocked_subject - user_mail_status_blocked_body + source_module: user process: 'status_activated/subject': user_mail_status_activated_subject 'status_activated/body': user_mail_status_activated_body diff --git a/core/modules/user/migration_templates/user_picture_field.yml b/core/modules/user/migration_templates/user_picture_field.yml index ff8bd827494cbf425131b1a1d936cf845eda9b6d..7f7134de929e66e979a124ada3b3af2fc6089b4b 100644 --- a/core/modules/user/migration_templates/user_picture_field.yml +++ b/core/modules/user/migration_templates/user_picture_field.yml @@ -12,6 +12,7 @@ source: type: image name: user_picture cardinality: 1 + source_module: user process: entity_type: 'constants/entity_type' field_name: 'constants/name' diff --git a/core/modules/user/src/Plugin/migrate/source/ProfileField.php b/core/modules/user/src/Plugin/migrate/source/ProfileField.php index 151d5017def07c5fda890b7bd457247955e3330e..93a0430d68e65ae4dc0e1d3bb4070d537a95d471 100644 --- 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 { diff --git a/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php index 441fdc78c751a43d7a5b27cac9dd033ea7a705c7..1f8e13aae0c255249e0c8841475520d99cc32ae0 100644 --- a/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php +++ b/core/modules/user/src/Plugin/migrate/source/UserPictureInstance.php @@ -11,7 +11,8 @@ * @todo Support default picture? * * @MigrateSource( - * id = "user_picture_instance" + * id = "user_picture_instance", + * source_module = "user" * ) */ class UserPictureInstance extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php b/core/modules/user/src/Plugin/migrate/source/d6/ProfileFieldValues.php index 80db9df9696d4b541e4c5e8a1ab51762de8d4826..ac4929092dc475278bfc71849e3b1967dd26f989 100644 --- 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 { diff --git a/core/modules/user/src/Plugin/migrate/source/d6/Role.php b/core/modules/user/src/Plugin/migrate/source/d6/Role.php index 82ad3e99325681fa45d799e2d846286665c5e22b..a809b07dc045c85c01779086be2f20e016115f09 100644 --- a/core/modules/user/src/Plugin/migrate/source/d6/Role.php +++ b/core/modules/user/src/Plugin/migrate/source/d6/Role.php @@ -9,7 +9,8 @@ * Drupal 6 role source from database. * * @MigrateSource( - * id = "d6_user_role" + * id = "d6_user_role", + * source_module = "user" * ) */ class Role extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d6/User.php b/core/modules/user/src/Plugin/migrate/source/d6/User.php index c8e9d19a702fdf99c155b0e11053cf85a1dffb44..5213534b4239d18b2e1df4ddd47eef2e7b9f26bb 100644 --- a/core/modules/user/src/Plugin/migrate/source/d6/User.php +++ b/core/modules/user/src/Plugin/migrate/source/d6/User.php @@ -9,7 +9,8 @@ * Drupal 6 user source from database. * * @MigrateSource( - * id = "d6_user" + * id = "d6_user", + * source_module = "user" * ) */ class User extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php index 6b16ad4009dbd57a66e6c9187e2631c9c764a242..0d5bd6bcb3103ffab5e7961017ecf4b8132bd421 100644 --- a/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php +++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPicture.php @@ -10,7 +10,8 @@ * @todo Support default picture? * * @MigrateSource( - * id = "d6_user_picture" + * id = "d6_user_picture", + * source_module = "user" * ) */ class UserPicture extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php index 8952ffdf82bc65fb00c1460edfe463ffa5489fcf..72d18fd08f36b247a27c615c317d3edbe91db73a 100644 --- a/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php +++ b/core/modules/user/src/Plugin/migrate/source/d6/UserPictureFile.php @@ -9,7 +9,8 @@ * Drupal 6 user picture source from database. * * @MigrateSource( - * id = "d6_user_picture_file" + * id = "d6_user_picture_file", + * source_module = "user" * ) */ class UserPictureFile extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d7/Role.php b/core/modules/user/src/Plugin/migrate/source/d7/Role.php index 9245aab96998463f828a5fee70230cd56cfdaee7..7950991a8fb7453a65b56543fa4d31c61c04f80f 100644 --- a/core/modules/user/src/Plugin/migrate/source/d7/Role.php +++ b/core/modules/user/src/Plugin/migrate/source/d7/Role.php @@ -9,7 +9,8 @@ * Drupal 7 role source from database. * * @MigrateSource( - * id = "d7_user_role" + * id = "d7_user_role", + * source_module = "user" * ) */ class Role extends DrupalSqlBase { diff --git a/core/modules/user/src/Plugin/migrate/source/d7/User.php b/core/modules/user/src/Plugin/migrate/source/d7/User.php index 408d998803e737f9ae3412e89f26bf910d699eec..41f9ab4d6ea17671c36d91af7df6e32050c3a475 100644 --- a/core/modules/user/src/Plugin/migrate/source/d7/User.php +++ b/core/modules/user/src/Plugin/migrate/source/d7/User.php @@ -9,7 +9,8 @@ * Drupal 7 user source from database. * * @MigrateSource( - * id = "d7_user" + * id = "d7_user", + * source_module = "user" * ) */ class User extends FieldableEntity {