diff -u b/core/modules/action/action.info.yml b/core/modules/action/action.info.yml --- b/core/modules/action/action.info.yml +++ b/core/modules/action/action.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/aggregator/aggregator.info.yml b/core/modules/aggregator/aggregator.info.yml --- b/core/modules/aggregator/aggregator.info.yml +++ b/core/modules/aggregator/aggregator.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/automated_cron/automated_cron.info.yml b/core/modules/automated_cron/automated_cron.info.yml --- b/core/modules/automated_cron/automated_cron.info.yml +++ b/core/modules/automated_cron/automated_cron.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/ban/ban.info.yml b/core/modules/ban/ban.info.yml --- b/core/modules/ban/ban.info.yml +++ b/core/modules/ban/ban.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: complete diff -u b/core/modules/basic_auth/basic_auth.info.yml b/core/modules/basic_auth/basic_auth.info.yml --- b/core/modules/basic_auth/basic_auth.info.yml +++ b/core/modules/basic_auth/basic_auth.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/big_pipe/big_pipe.info.yml b/core/modules/big_pipe/big_pipe.info.yml --- b/core/modules/big_pipe/big_pipe.info.yml +++ b/core/modules/big_pipe/big_pipe.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/block/block.info.yml b/core/modules/block/block.info.yml --- b/core/modules/block/block.info.yml +++ b/core/modules/block/block.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/block_content/block_content.info.yml b/core/modules/block_content/block_content.info.yml --- b/core/modules/block_content/block_content.info.yml +++ b/core/modules/block_content/block_content.info.yml @@ -12,5 +12,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/block_place/block_place.info.yml b/core/modules/block_place/block_place.info.yml --- b/core/modules/block_place/block_place.info.yml +++ b/core/modules/block_place/block_place.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/book/book.info.yml b/core/modules/book/book.info.yml --- b/core/modules/book/book.info.yml +++ b/core/modules/book/book.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/breakpoint/breakpoint.info.yml b/core/modules/breakpoint/breakpoint.info.yml --- b/core/modules/breakpoint/breakpoint.info.yml +++ b/core/modules/breakpoint/breakpoint.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/ckeditor/ckeditor.info.yml b/core/modules/ckeditor/ckeditor.info.yml --- b/core/modules/ckeditor/ckeditor.info.yml +++ b/core/modules/ckeditor/ckeditor.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/color/color.info.yml b/core/modules/color/color.info.yml --- b/core/modules/color/color.info.yml +++ b/core/modules/color/color.info.yml @@ -8,4 +8,7 @@ - 6: + - + version: 6 status: n/a - 7: - status: complete + - + version: 7 + status: coplete + diff -u b/core/modules/comment/comment.info.yml b/core/modules/comment/comment.info.yml --- b/core/modules/comment/comment.info.yml +++ b/core/modules/comment/comment.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/config/config.info.yml b/core/modules/config/config.info.yml --- b/core/modules/config/config.info.yml +++ b/core/modules/config/config.info.yml @@ -9,4 +9,7 @@ - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a + diff -u b/core/modules/config_translation/config_translation.info.yml b/core/modules/config_translation/config_translation.info.yml --- b/core/modules/config_translation/config_translation.info.yml +++ b/core/modules/config_translation/config_translation.info.yml @@ -9,8 +9,10 @@ - drupal:locale migrate: - 6: + - + version: 6 status: incomplete description: See Details - 7: + - + version: 7 status: incomplete description: See Details diff -u b/core/modules/contact/contact.info.yml b/core/modules/contact/contact.info.yml --- b/core/modules/contact/contact.info.yml +++ b/core/modules/contact/contact.info.yml @@ -9,4 +9,7 @@ - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete + diff -u b/core/modules/content_moderation/content_moderation.info.yml b/core/modules/content_moderation/content_moderation.info.yml --- b/core/modules/content_moderation/content_moderation.info.yml +++ b/core/modules/content_moderation/content_moderation.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/content_translation/content_translation.info.yml b/core/modules/content_translation/content_translation.info.yml --- b/core/modules/content_translation/content_translation.info.yml +++ b/core/modules/content_translation/content_translation.info.yml @@ -9,8 +9,10 @@ configure: language.content_settings_page migrate: - 6: + - + version: 6 status: incomplete description: See Details - 7: + - + version: 7 status: incomplete description: See Details diff -u b/core/modules/contextual/contextual.info.yml b/core/modules/contextual/contextual.info.yml --- b/core/modules/contextual/contextual.info.yml +++ b/core/modules/contextual/contextual.info.yml @@ -8,4 +8,7 @@ - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a + diff -u b/core/modules/datetime/datetime.info.yml b/core/modules/datetime/datetime.info.yml --- b/core/modules/datetime/datetime.info.yml +++ b/core/modules/datetime/datetime.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/datetime_range/datetime_range.info.yml b/core/modules/datetime_range/datetime_range.info.yml --- b/core/modules/datetime_range/datetime_range.info.yml +++ b/core/modules/datetime_range/datetime_range.info.yml @@ -10,4 +10,7 @@ - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a + diff -u b/core/modules/dblog/dblog.info.yml b/core/modules/dblog/dblog.info.yml --- b/core/modules/dblog/dblog.info.yml +++ b/core/modules/dblog/dblog.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml b/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml --- b/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml +++ b/core/modules/dynamic_page_cache/dynamic_page_cache.info.yml @@ -8,4 +8,7 @@ - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a + diff -u b/core/modules/editor/editor.info.yml b/core/modules/editor/editor.info.yml --- b/core/modules/editor/editor.info.yml +++ b/core/modules/editor/editor.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/entity_reference/entity_reference.info.yml b/core/modules/entity_reference/entity_reference.info.yml --- b/core/modules/entity_reference/entity_reference.info.yml +++ b/core/modules/entity_reference/entity_reference.info.yml @@ -9,4 +9,6 @@ - 6: - status: n/a - 7: - status: n/a + - + version: 6 + status: complete + - + version: 7 + status: complete diff -u b/core/modules/field/field.info.yml b/core/modules/field/field.info.yml --- b/core/modules/field/field.info.yml +++ b/core/modules/field/field.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/field_layout/field_layout.info.yml b/core/modules/field_layout/field_layout.info.yml --- b/core/modules/field_layout/field_layout.info.yml +++ b/core/modules/field_layout/field_layout.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/field_ui/field_ui.info.yml b/core/modules/field_ui/field_ui.info.yml --- b/core/modules/field_ui/field_ui.info.yml +++ b/core/modules/field_ui/field_ui.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/file/file.info.yml b/core/modules/file/file.info.yml --- b/core/modules/file/file.info.yml +++ b/core/modules/file/file.info.yml @@ -10,4 +10,7 @@ - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete + diff -u b/core/modules/filter/filter.info.yml b/core/modules/filter/filter.info.yml --- b/core/modules/filter/filter.info.yml +++ b/core/modules/filter/filter.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/forum/forum.info.yml b/core/modules/forum/forum.info.yml --- b/core/modules/forum/forum.info.yml +++ b/core/modules/forum/forum.info.yml @@ -14,5 +14,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/hal/hal.info.yml b/core/modules/hal/hal.info.yml --- b/core/modules/hal/hal.info.yml +++ b/core/modules/hal/hal.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/help/help.info.yml b/core/modules/help/help.info.yml --- b/core/modules/help/help.info.yml +++ b/core/modules/help/help.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/history/history.info.yml b/core/modules/history/history.info.yml --- b/core/modules/history/history.info.yml +++ b/core/modules/history/history.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/image/image.info.yml b/core/modules/image/image.info.yml --- b/core/modules/image/image.info.yml +++ b/core/modules/image/image.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/inline_form_errors/inline_form_errors.info.yml b/core/modules/inline_form_errors/inline_form_errors.info.yml --- b/core/modules/inline_form_errors/inline_form_errors.info.yml +++ b/core/modules/inline_form_errors/inline_form_errors.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/language/language.info.yml b/core/modules/language/language.info.yml --- b/core/modules/language/language.info.yml +++ b/core/modules/language/language.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/layout_builder/layout_builder.info.yml b/core/modules/layout_builder/layout_builder.info.yml --- b/core/modules/layout_builder/layout_builder.info.yml +++ b/core/modules/layout_builder/layout_builder.info.yml @@ -12,5 +12,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/layout_discovery/layout_discovery.info.yml b/core/modules/layout_discovery/layout_discovery.info.yml --- b/core/modules/layout_discovery/layout_discovery.info.yml +++ b/core/modules/layout_discovery/layout_discovery.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/link/link.info.yml b/core/modules/link/link.info.yml --- b/core/modules/link/link.info.yml +++ b/core/modules/link/link.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/locale/locale.info.yml b/core/modules/locale/locale.info.yml --- b/core/modules/locale/locale.info.yml +++ b/core/modules/locale/locale.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/media/media.info.yml b/core/modules/media/media.info.yml --- b/core/modules/media/media.info.yml +++ b/core/modules/media/media.info.yml @@ -12,5 +12,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/menu_link_content/menu_link_content.info.yml b/core/modules/menu_link_content/menu_link_content.info.yml --- b/core/modules/menu_link_content/menu_link_content.info.yml +++ b/core/modules/menu_link_content/menu_link_content.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/menu_ui/menu_ui.info.yml b/core/modules/menu_ui/menu_ui.info.yml --- b/core/modules/menu_ui/menu_ui.info.yml +++ b/core/modules/menu_ui/menu_ui.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/migrate/migrate.info.yml b/core/modules/migrate/migrate.info.yml --- b/core/modules/migrate/migrate.info.yml +++ b/core/modules/migrate/migrate.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/migrate_drupal/migrate_drupal.info.yml b/core/modules/migrate_drupal/migrate_drupal.info.yml --- b/core/modules/migrate_drupal/migrate_drupal.info.yml +++ b/core/modules/migrate_drupal/migrate_drupal.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml --- b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml +++ b/core/modules/migrate_drupal_ui/migrate_drupal_ui.info.yml @@ -12,5 +12,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php --- b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php @@ -199,11 +199,16 @@ } // Get migration status for all modules. - $systemInfo = system_get_info('module'); - $destinationModuleInfo = $systemInfo; - foreach ($systemInfo as $module => $info) { - if ($info['type'] === 'profile') { - unset($destinationModuleInfo[$module]); + $system_info = system_get_info('module'); + foreach ($system_info as $module => $info) { + if (isset($info['migrate'])) { + foreach ($info['migrate'] as $migrate_info) { + if (isset($migrate_info['version'])) { + if ($migrate_info['version'] == $version) { + $destination_system_migrate_info[$module] = $migrate_info; + } + } + } } } @@ -251,9 +256,9 @@ // Add source_module and destination_module for destination modules with // status 'n/a' and are enabled on the source site. - foreach ($destinationModuleInfo as $extension => $info) { - if (isset($info['migrate'][$version]['status'])) { - if (strtolower($info['migrate'][$version]['status'] ) === 'n/a') { + foreach ($destination_system_migrate_info as $extension => $migrate_info) { + if (isset($migrate_info['status'])) { + if (strtolower($migrate_info['status']) === 'n/a') { if (isset($system_data['module'][$extension]) && $system_data['module'][$extension]['status']) { $table_data[$extension]['core'][$extension] = $extension; } @@ -283,7 +288,10 @@ '#open' => TRUE, '#title' => $this->t('Modules that will not be upgraded'), '#summary_attributes' => ['id' => ['error']], - '#description' => $this->t('There are no modules installed on your new site to replace these modules. If you proceed with the upgrade now, configuration and/or content needed by these modules will not be available on your new site. For more information, see Review the pre-upgrade analysis in the Upgrading to Drupal 8 handbook.', [':review' => 'https://www.drupal.org/docs/8/upgrade/upgrade-using-web-browser#pre-upgrade-analysis', ':migrate' => 'https://www.drupal.org/docs/8/upgrade']), + '#description' => $this->t('There are no modules installed on your new site to replace these modules. If you proceed with the upgrade now, configuration and/or content needed by these modules will not be available on your new site. For more information, see Review the pre-upgrade analysis in the Upgrading to Drupal 8 handbook.', [ + ':review' => 'https://www.drupal.org/docs/8/upgrade/upgrade-using-web-browser#pre-upgrade-analysis', + ':migrate' => 'https://www.drupal.org/docs/8/upgrade', + ]), '#weight' => 2, ]; $missing_module_list['module_list'] = [ @@ -297,11 +305,15 @@ $missing_count = 0; ksort($unmigrated_source_modules); foreach ($unmigrated_source_modules as $source_module => $module_data) { - $output = isset($destinationModuleInfo[$source_module]['migrate'][$version]['description']) ? $destinationModuleInfo[$source_module]['migrate'][$version]['description'] : ''; - $destination_description = [ - '#type' => 'item', - '#markup' => Xss::filterAdmin($output), - ]; + // Get the system information for $source_module. + $destination_description = []; + if (isset($destination_system_migrate_info[$source_module])) { + $output = isset($destination_system_migrate_info[$source_module]['description']) ? $destination_system_migrate_info[$source_module]['description'] : ''; + $destination_description = [ + '#type' => 'item', + '#markup' => Xss::filterAdmin($output), + ]; + } if ($module_data['status']) { $missing_count++; $missing_module_list['module_list'][$source_module] = [ @@ -349,9 +361,11 @@ '#type' => 'item', '#plain_text' => $destination_module, ]; - - $output = isset($destinationModuleInfo[$destination_module]['migrate'][$version]['description']) ? $destinationModuleInfo[$destination_module]['migrate'][$version]['description'] : ''; - $destination_description[$destination_module] = [ + } + // Get the system information for $source_module. + if (isset($destination_system_migrate_info[$source_module])) { + $output = isset($destination_system_migrate_info[$source_module]['description']) ? $destination_system_migrate_info[$source_module]['description'] : ''; + $destination_description = [ '#type' => 'item', '#markup' => Xss::filterAdmin($output), ]; diff -u b/core/modules/node/node.info.yml b/core/modules/node/node.info.yml --- b/core/modules/node/node.info.yml +++ b/core/modules/node/node.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/options/options.info.yml b/core/modules/options/options.info.yml --- b/core/modules/options/options.info.yml +++ b/core/modules/options/options.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/page_cache/page_cache.info.yml b/core/modules/page_cache/page_cache.info.yml --- b/core/modules/page_cache/page_cache.info.yml +++ b/core/modules/page_cache/page_cache.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/path/path.info.yml b/core/modules/path/path.info.yml --- b/core/modules/path/path.info.yml +++ b/core/modules/path/path.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/quickedit/quickedit.info.yml b/core/modules/quickedit/quickedit.info.yml --- b/core/modules/quickedit/quickedit.info.yml +++ b/core/modules/quickedit/quickedit.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/rdf/rdf.info.yml b/core/modules/rdf/rdf.info.yml --- b/core/modules/rdf/rdf.info.yml +++ b/core/modules/rdf/rdf.info.yml @@ -6,7 +6,9 @@ core: 8.x migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: incomplete description: See Details diff -u b/core/modules/responsive_image/responsive_image.info.yml b/core/modules/responsive_image/responsive_image.info.yml --- b/core/modules/responsive_image/responsive_image.info.yml +++ b/core/modules/responsive_image/responsive_image.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/rest/rest.info.yml b/core/modules/rest/rest.info.yml --- b/core/modules/rest/rest.info.yml +++ b/core/modules/rest/rest.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/search/search.info.yml b/core/modules/search/search.info.yml --- b/core/modules/search/search.info.yml +++ b/core/modules/search/search.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/serialization/serialization.info.yml b/core/modules/serialization/serialization.info.yml --- b/core/modules/serialization/serialization.info.yml +++ b/core/modules/serialization/serialization.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/settings_tray/settings_tray.info.yml b/core/modules/settings_tray/settings_tray.info.yml --- b/core/modules/settings_tray/settings_tray.info.yml +++ b/core/modules/settings_tray/settings_tray.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/shortcut/shortcut.info.yml b/core/modules/shortcut/shortcut.info.yml --- b/core/modules/shortcut/shortcut.info.yml +++ b/core/modules/shortcut/shortcut.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: complete diff -u b/core/modules/simpletest/simpletest.info.yml b/core/modules/simpletest/simpletest.info.yml --- b/core/modules/simpletest/simpletest.info.yml +++ b/core/modules/simpletest/simpletest.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/statistics/statistics.info.yml b/core/modules/statistics/statistics.info.yml --- b/core/modules/statistics/statistics.info.yml +++ b/core/modules/statistics/statistics.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/syslog/syslog.info.yml b/core/modules/syslog/syslog.info.yml --- b/core/modules/syslog/syslog.info.yml +++ b/core/modules/syslog/syslog.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/system/system.info.yml b/core/modules/system/system.info.yml --- b/core/modules/system/system.info.yml +++ b/core/modules/system/system.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/taxonomy/taxonomy.info.yml b/core/modules/taxonomy/taxonomy.info.yml --- b/core/modules/taxonomy/taxonomy.info.yml +++ b/core/modules/taxonomy/taxonomy.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/telephone/telephone.info.yml b/core/modules/telephone/telephone.info.yml --- b/core/modules/telephone/telephone.info.yml +++ b/core/modules/telephone/telephone.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/text/text.info.yml b/core/modules/text/text.info.yml --- b/core/modules/text/text.info.yml +++ b/core/modules/text/text.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/toolbar/toolbar.info.yml b/core/modules/toolbar/toolbar.info.yml --- b/core/modules/toolbar/toolbar.info.yml +++ b/core/modules/toolbar/toolbar.info.yml @@ -9,5 +9,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/tour/tour.info.yml b/core/modules/tour/tour.info.yml --- b/core/modules/tour/tour.info.yml +++ b/core/modules/tour/tour.info.yml @@ -7,5 +7,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/tracker/tracker.info.yml b/core/modules/tracker/tracker.info.yml --- b/core/modules/tracker/tracker.info.yml +++ b/core/modules/tracker/tracker.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: complete diff -u b/core/modules/update/update.info.yml b/core/modules/update/update.info.yml --- b/core/modules/update/update.info.yml +++ b/core/modules/update/update.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/user/user.info.yml b/core/modules/user/user.info.yml --- b/core/modules/user/user.info.yml +++ b/core/modules/user/user.info.yml @@ -11,5 +11,7 @@ migrate: - 6: + - + version: 6 status: complete - 7: + - + version: 7 status: complete diff -u b/core/modules/views/views.info.yml b/core/modules/views/views.info.yml --- b/core/modules/views/views.info.yml +++ b/core/modules/views/views.info.yml @@ -10,6 +10,8 @@ - 6: + - + version: 6 status: incomplete description: See Views - 7: + - + version: 7 status: incomplete - description: see Views. + description: See Views diff -u b/core/modules/views_ui/views_ui.info.yml b/core/modules/views_ui/views_ui.info.yml --- b/core/modules/views_ui/views_ui.info.yml +++ b/core/modules/views_ui/views_ui.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/workflows/workflows.info.yml b/core/modules/workflows/workflows.info.yml --- b/core/modules/workflows/workflows.info.yml +++ b/core/modules/workflows/workflows.info.yml @@ -8,5 +8,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a diff -u b/core/modules/workspaces/workspaces.info.yml b/core/modules/workspaces/workspaces.info.yml --- b/core/modules/workspaces/workspaces.info.yml +++ b/core/modules/workspaces/workspaces.info.yml @@ -10,5 +10,7 @@ migrate: - 6: + - + version: 6 status: n/a - 7: + - + version: 7 status: n/a only in patch2: unchanged: --- a/core/modules/media_library/media_library.info.yml +++ b/core/modules/media_library/media_library.info.yml @@ -8,3 +8,10 @@ dependencies: - drupal:media - drupal:views - drupal:user +migrate: + - + version: 6 + status: n/a + - + version: 7 + status: n/a only in patch2: unchanged: --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml @@ -5,3 +5,10 @@ package: 'Core (Experimental)' core: 8.x dependencies: - migrate_drupal +migrate: + - + version: 6 + status: n/a + - + version: 7 + status: n/a only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeReviewPageTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeReviewPageTestBase.php @@ -65,6 +65,7 @@ public function testMigrateUpgradeReviewPage() { $available_paths = $this->getAvailablePaths(); $missing_paths = $this->getMissingPaths(); $this->assertUpgradePaths($session, $available_paths, $missing_paths); + $this->assertDetails($session, $this->getDetails); // Check there are no errors when a module in noUpgradePaths is not in the // source system tables. Test with a module that is listed in noUpgradePaths only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/MigrateUpgradeTestBase.php @@ -126,6 +126,20 @@ protected function assertUpgradePaths(WebAssert $session, array $available_paths } /** + * Tests the displayed upgrade paths. + * + * @param \Drupal\Tests\WebAssert $session + * The web-assert session. + * @param array $details + * An array of detail messages displayed on the review page. + */ + protected function assertDetails(WebAssert $session, array $details = []) { + foreach ($details as $detail) { + $session->pageTextNotContains($detail); + } + } + + /** * Gets the source base path for the concrete test. * * @return string only in patch2: unchanged: --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php @@ -152,4 +152,13 @@ protected function getMissingPaths() { ]; } + /** + * {@inheritdoc} + */ + protected function getDetails() { + return [ + 'See Views' + ]; + } + }