diff --git a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php index be66745fdb..cfd524115f 100644 --- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php +++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php @@ -27,8 +27,6 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase { 'path_alias', 'statistics', 'taxonomy', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php index cb24a69ab3..6caeb03c11 100644 --- a/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php +++ b/core/modules/block/tests/src/Kernel/Migrate/d7/MigrateBlockContentTranslationTest.php @@ -31,8 +31,6 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal7TestBase { 'path_alias', 'statistics', 'taxonomy', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php index 99bbc42855..9a49f33058 100644 --- a/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php +++ b/core/modules/block_content/tests/src/Kernel/Migrate/d6/MigrateCustomBlockContentTranslationTest.php @@ -19,8 +19,6 @@ class MigrateCustomBlockContentTranslationTest extends MigrateDrupal6TestBase { 'block_content', 'content_translation', 'language', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php index 5f3b98b9c1..03453c823f 100644 --- a/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php +++ b/core/modules/block_content/tests/src/Kernel/Migrate/d7/MigrateCustomBlockContentTranslationTest.php @@ -21,8 +21,6 @@ class MigrateCustomBlockContentTranslationTest extends MigrateDrupal7TestBase { 'filter', 'language', 'text', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php index c51529b689..ca23665226 100644 --- a/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php +++ b/core/modules/comment/tests/src/Kernel/Migrate/d7/MigrateCommentTest.php @@ -26,8 +26,6 @@ class MigrateCommentTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php index 26d68eed99..71324a6201 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemMaintenanceTranslationTest.php @@ -15,8 +15,6 @@ class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal6TestBase { public static $modules = [ 'language', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php index e420943264..ca8404964f 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateSystemSiteTranslationTest.php @@ -15,8 +15,6 @@ class MigrateSystemSiteTranslationTest extends MigrateDrupal6TestBase { public static $modules = [ 'language', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php index 5ff8402deb..c6fcc5801f 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserConfigsTranslationTest.php @@ -19,8 +19,6 @@ class MigrateUserConfigsTranslationTest extends MigrateDrupal6TestBase { 'language', 'locale', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php index 033f22b9e8..de0094c644 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d6/MigrateUserProfileFieldInstanceTranslationTest.php @@ -20,8 +20,6 @@ class MigrateUserProfileFieldInstanceTranslationTest extends MigrateDrupal6TestB 'locale', 'language', 'field', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php index df44e407d4..9724cfefad 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemMaintenanceTranslationTest.php @@ -14,8 +14,6 @@ class MigrateSystemMaintenanceTranslationTest extends MigrateDrupal7TestBase { public static $modules = [ 'language', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php index e25a0f8fb9..bb28e30244 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateSystemSiteTranslationTest.php @@ -17,8 +17,6 @@ class MigrateSystemSiteTranslationTest extends MigrateDrupal7TestBase { public static $modules = [ 'language', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php index 2388fe3240..d830712acc 100644 --- a/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php +++ b/core/modules/config_translation/tests/src/Kernel/Migrate/d7/MigrateUserConfigsTranslationTest.php @@ -21,8 +21,6 @@ class MigrateUserConfigsTranslationTest extends MigrateDrupal7TestBase { 'language', 'locale', 'config_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php index 1baf584efe..21b977927a 100644 --- a/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php +++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d6/MigrateTaxonomyTermTranslationTest.php @@ -20,8 +20,6 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', ]; diff --git a/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php b/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php index 136e5331ec..5fb6ddde60 100644 --- a/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php +++ b/core/modules/content_translation/tests/src/Kernel/Migrate/d7/MigrateEntityTranslationSettingsTest.php @@ -20,8 +20,6 @@ class MigrateEntityTranslationSettingsTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'text', diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php index 17ffd2f82e..89bb556a17 100644 --- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php +++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldInstanceLabelDescriptionTest.php @@ -29,8 +29,6 @@ class MigrateFieldInstanceLabelDescriptionTest extends MigrateDrupal7TestBase im 'link', 'locale', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'system', 'taxonomy', diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php index 0d9981ab1e..d75cbae3c3 100644 --- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php +++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadTest.php @@ -20,8 +20,6 @@ class MigrateUploadTest extends MigrateDrupal6TestBase { 'language', 'content_translation', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php index 34ea62a03a..7a4aa6f1c9 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTest.php @@ -23,8 +23,6 @@ class MigrateMenuLinkTest extends MigrateNodeTestBase { 'content_translation', 'language', 'menu_link_content', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'menu_ui', ]; diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php index 2eab72a439..20d259e685 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d6/MigrateMenuLinkTranslationTest.php @@ -23,8 +23,6 @@ class MigrateMenuLinkTranslationTest extends MigrateDrupal6TestBase { 'menu_link_content', 'language', 'content_translation', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php index 36904bd5f4..8e87e6ce51 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php @@ -27,8 +27,6 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase { 'link', 'menu_ui', 'menu_link_content', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'text', ]; diff --git a/core/modules/migrate_drupal/migrate_drupal.post_update.php b/core/modules/migrate_drupal/migrate_drupal.post_update.php new file mode 100644 index 0000000000..b449b26b75 --- /dev/null +++ b/core/modules/migrate_drupal/migrate_drupal.post_update.php @@ -0,0 +1,22 @@ +uninstall(['migrate_drupal_multilingual']); +} + +/** + * @} End of "addtogroup updates-8.9.x". + */ diff --git a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php index 4c3170ba70..85a546debe 100644 --- a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php +++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php @@ -153,11 +153,6 @@ protected function getMigrations($database_state_key, $drupal_version) { if (!empty(array_intersect($migration->getMigrationTags(), $this->getFollowUpMigrationTags()))) { continue; } - // Multilingual migrations require migrate_drupal_multilingual. - $tags = $migration->getMigrationTags() ?: []; - if (in_array('Multilingual', $tags, TRUE) && (!\Drupal::service('module_handler')->moduleExists('migrate_drupal_multilingual'))) { - throw new RequirementsException(sprintf("Install migrate_drupal_multilingual to run migration '%s'.", $migration->getPluginId())); - } try { // @todo https://drupal.org/node/2681867 We should be able to validate diff --git a/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php b/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php new file mode 100644 index 0000000000..905a8e6f4c --- /dev/null +++ b/core/modules/migrate_drupal/tests/fixtures/drupal-8.migrate-drupal-multilingual-enabled.php @@ -0,0 +1,36 @@ +merge('key_value') + ->fields([ + 'value' => 'i:8000;', + 'name' => 'migrate_drupal_multilingual', + 'collection' => 'system.schema', + ]) + ->condition('collection', 'system.schema') + ->condition('name', 'migrate_drupal_multilingual') + ->execute(); + +// Update core.extension. +$extensions = $connection->select('config') + ->fields('config', ['data']) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute() + ->fetchField(); +$extensions = unserialize($extensions); +$extensions['module']['migrate_drupal_multilingual'] = 8000; +$connection->update('config') + ->fields([ + 'data' => serialize($extensions), + 'collection' => '', + 'name' => 'core.extension', + ]) + ->condition('collection', '') + ->condition('name', 'core.extension') + ->execute(); diff --git a/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php b/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php new file mode 100644 index 0000000000..a7aabdc946 --- /dev/null +++ b/core/modules/migrate_drupal/tests/src/Functional/MigrateDrupalUpdateTest.php @@ -0,0 +1,38 @@ +databaseDumpFiles = [ + __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.8.0.filled.standard.php.gz', + __DIR__ . '/../../fixtures/drupal-8.migrate-drupal-multilingual-enabled.php', + ]; + } + + /** + * Tests migrate_drupal_multilingual uninstallation. + * + * @see migrate_drupal_post_update_uninstall_multilingual() + */ + public function testSourceFeedRequired() { + $this->assertTrue(\Drupal::moduleHandler()->moduleExists('migrate_drupal_multilingual')); + // Run updates. + $this->runUpdates(); + + $this->assertFalse(\Drupal::moduleHandler()->moduleExists('migrate_drupal_multilingual')); + } + +} diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml index 47081a9f51..f57f399186 100644 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml @@ -4,3 +4,4 @@ description: 'Provides a requirement for multilingual migrations.' package: 'Core (Experimental)' dependencies: - migrate_drupal +hidden: true diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install new file mode 100644 index 0000000000..7256494eec --- /dev/null +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install @@ -0,0 +1,23 @@ + t('Migrate Drupal Multilingual'), + 'severity' => REQUIREMENT_ERROR, + 'description' => t('The Migrate Drupal Multilingual module is deprecated and should not be installed.'), + ]; + } + return $requirements; +} diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php index f4353ddc0b..0163cc9d8f 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php @@ -31,8 +31,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase { 'syslog', 'tracker', 'update', - // Required for translation migrations. - 'migrate_drupal_multilingual', // Test migrations states. 'migrate_state_finished_test', 'migrate_state_not_finished_test', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php deleted file mode 100644 index 20f7098bd3..0000000000 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php +++ /dev/null @@ -1,209 +0,0 @@ -loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal6.php'); - } - - /** - * {@inheritdoc} - */ - protected function getSourceBasePath() { - return __DIR__ . '/files'; - } - - /** - * {@inheritdoc} - */ - protected function getEntityCounts() { - return [ - 'aggregator_item' => 1, - 'aggregator_feed' => 2, - 'block' => 35, - 'block_content' => 2, - 'block_content_type' => 1, - 'comment' => 6, - // The 'standard' profile provides the 'comment' comment type, and the - // migration creates 12 comment types, one per node type. - 'comment_type' => 13, - 'contact_form' => 5, - 'configurable_language' => 5, - 'editor' => 2, - 'field_config' => 89, - 'field_storage_config' => 63, - 'file' => 8, - 'filter_format' => 7, - 'image_style' => 5, - 'language_content_settings' => 3, - 'migration' => 105, - 'node' => 17, - // The 'book' module provides the 'book' node type, and the migration - // creates 12 node types. - 'node_type' => 13, - 'rdf_mapping' => 7, - 'search_page' => 2, - 'shortcut' => 2, - 'shortcut_set' => 1, - 'action' => 23, - 'menu' => 8, - 'taxonomy_term' => 8, - 'taxonomy_vocabulary' => 7, - 'tour' => 4, - 'user' => 7, - 'user_role' => 6, - 'menu_link_content' => 8, - 'view' => 16, - 'date_format' => 11, - 'entity_form_display' => 29, - 'entity_form_mode' => 1, - 'entity_view_display' => 55, - 'entity_view_mode' => 14, - 'base_field_override' => 38, - ]; - } - - /** - * {@inheritdoc} - */ - protected function getEntityCountsIncremental() { - $counts = $this->getEntityCounts(); - $counts['block_content'] = 3; - $counts['comment'] = 7; - $counts['file'] = 9; - $counts['menu_link_content'] = 9; - $counts['node'] = 18; - $counts['taxonomy_term'] = 9; - $counts['user'] = 8; - $counts['view'] = 16; - return $counts; - } - - /** - * {@inheritdoc} - */ - protected function getAvailablePaths() { - return [ - 'aggregator', - 'block', - 'book', - 'comment', - 'contact', - 'content', - 'date', - 'dblog', - 'email', - 'filefield', - 'filter', - 'forum', - 'imagecache', - 'imagefield', - 'link', - 'locale', - 'menu', - 'node', - 'nodereference', - 'optionwidgets', - 'path', - 'profile', - 'search', - 'statistics', - 'system', - 'taxonomy', - 'text', - 'upload', - 'user', - 'userreference', - // Include modules that do not have an upgrade path and are enabled in the - // source database. - 'date_api', - 'date_timezone', - 'event', - 'i18n', - 'i18nstrings', - 'imageapi', - 'number', - 'php', - 'profile', - 'variable_admin', - ]; - } - - /** - * {@inheritdoc} - */ - protected function getMissingPaths() { - return [ - 'i18nblocks', - 'i18ncck', - 'i18ncontent', - 'i18nmenu', - 'i18nprofile', - ]; - } - - /** - * {@inheritdoc} - */ - public function testMigrateUpgradeExecute() { - $connection_options = $this->sourceDatabase->getConnectionOptions(); - $this->drupalGet('/upgrade'); - $session = $this->assertSession(); - $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.'); - - $button = $session->buttonExists('Continue'); - $button->click(); - $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.'); - - $driver = $connection_options['driver']; - $connection_options['prefix'] = $connection_options['prefix']['default']; - - // Use the driver connection form to get the correct options out of the - // database settings. This supports all of the databases we test against. - $drivers = drupal_get_database_types(); - $form = $drivers[$driver]->getFormOptions($connection_options); - $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']); - $version = $this->getLegacyDrupalVersion($this->sourceDatabase); - $edit = [ - $driver => $connection_options, - 'version' => $version, - ]; - if (count($drivers) !== 1) { - $edit['driver'] = $driver; - } - $edits = $this->translatePostValues($edit); - $this->drupalPostForm(NULL, $edits, t('Review upgrade')); - $session->pageTextContains("Install migrate_drupal_multilingual to run migration 'd6_system_maintenance_translation'."); - } - -} diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php index b0061da3ff..7d8822d5d1 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php @@ -33,8 +33,6 @@ class Upgrade6Test extends MigrateUpgradeExecuteTestBase { 'forum', 'statistics', 'migration_provider_test', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php index 86cab74ea3..8a44e0a632 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php @@ -30,8 +30,6 @@ class MultilingualReviewPageTest extends MultilingualReviewPageTestBase { 'syslog', 'tracker', 'update', - // Required for translation migrations. - 'migrate_drupal_multilingual', // Test migrations states. 'migrate_state_finished_test', 'migrate_state_not_finished_test', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php deleted file mode 100644 index 46421a69f9..0000000000 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php +++ /dev/null @@ -1,220 +0,0 @@ -loadFixture(drupal_get_path('module', 'migrate_drupal') . '/tests/fixtures/drupal7.php'); - } - - /** - * {@inheritdoc} - */ - protected function getSourceBasePath() { - return __DIR__ . '/files'; - } - - /** - * {@inheritdoc} - */ - protected function getEntityCounts() { - return [ - 'aggregator_item' => 11, - 'aggregator_feed' => 1, - 'block' => 25, - 'block_content' => 1, - 'block_content_type' => 1, - 'comment' => 2, - // The 'standard' profile provides the 'comment' comment type, and the - // migration creates 6 comment types, one per node type. - 'comment_type' => 7, - // Module 'language' comes with 'en', 'und', 'zxx'. Migration adds 'is'. - 'configurable_language' => 4, - 'contact_form' => 3, - 'editor' => 2, - 'field_config' => 68, - 'field_storage_config' => 50, - 'file' => 3, - 'filter_format' => 7, - 'image_style' => 6, - 'language_content_settings' => 2, - 'migration' => 73, - 'node' => 5, - 'node_type' => 6, - 'rdf_mapping' => 8, - 'search_page' => 2, - 'shortcut' => 6, - 'shortcut_set' => 2, - 'action' => 17, - 'menu' => 6, - 'taxonomy_term' => 18, - 'taxonomy_vocabulary' => 4, - 'tour' => 4, - 'user' => 4, - 'user_role' => 3, - 'menu_link_content' => 10, - 'view' => 16, - 'date_format' => 11, - 'entity_form_display' => 17, - 'entity_form_mode' => 1, - 'entity_view_display' => 28, - 'entity_view_mode' => 14, - 'base_field_override' => 9, - ]; - } - - /** - * {@inheritdoc} - */ - protected function getEntityCountsIncremental() { - $counts = $this->getEntityCounts(); - $counts['block_content'] = 2; - $counts['comment'] = 3; - $counts['file'] = 4; - $counts['menu_link_content'] = 11; - $counts['node'] = 6; - $counts['taxonomy_term'] = 19; - $counts['user'] = 5; - return $counts; - } - - /** - * {@inheritdoc} - */ - protected function getAvailablePaths() { - return [ - 'aggregator', - 'block', - 'book', - 'color', - 'comment', - 'contact', - 'date', - 'dblog', - 'email', - 'entityreference', - 'field', - 'field_sql_storage', - 'file', - 'filter', - 'forum', - 'image', - 'language', - 'link', - 'list', - 'locale', - 'menu', - 'node', - 'number', - 'options', - 'path', - 'phone', - 'rdf', - 'search', - 'shortcut', - 'statistics', - 'system', - 'taxonomy', - 'text', - 'user', - // Include modules that do not have an upgrade path and are enabled in the - // source database. - 'blog', - 'contextual', - 'date_api', - 'entity', - 'field_ui', - 'help', - 'php', - 'simpletest', - 'toolbar', - 'translation', - 'trigger', - ]; - } - - /** - * {@inheritdoc} - */ - protected function getIncompletePaths() { - return []; - } - - /** - * {@inheritdoc} - */ - protected function getMissingPaths() { - return [ - // These modules are in the missing path list because they are installed - // on the source site but they are not installed on the destination site. - 'syslog', - 'tracker', - 'update', - ]; - } - - /** - * {@inheritdoc} - */ - public function testMigrateUpgradeExecute() { - $connection_options = $this->sourceDatabase->getConnectionOptions(); - $this->drupalGet('/upgrade'); - $session = $this->assertSession(); - $session->responseContains('Upgrade a site by importing its files and the data from its database into a clean and empty new install of Drupal 8.'); - - $button = $session->buttonExists('Continue'); - $button->click(); - $session->pageTextContains('Provide credentials for the database of the Drupal site you want to upgrade.'); - - $driver = $connection_options['driver']; - $connection_options['prefix'] = $connection_options['prefix']['default']; - - // Use the driver connection form to get the correct options out of the - // database settings. This supports all of the databases we test against. - $drivers = drupal_get_database_types(); - $form = $drivers[$driver]->getFormOptions($connection_options); - $connection_options = array_intersect_key($connection_options, $form + $form['advanced_options']); - $version = $this->getLegacyDrupalVersion($this->sourceDatabase); - $edit = [ - $driver => $connection_options, - 'version' => $version, - ]; - if (count($drivers) !== 1) { - $edit['driver'] = $driver; - } - $edits = $this->translatePostValues($edit); - $this->drupalPostForm(NULL, $edits, t('Review upgrade')); - $session->pageTextContains("Install migrate_drupal_multilingual to run migration 'd7_system_maintenance_translation'."); - } - -} diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php index 679f1f418d..2f7072f94e 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php @@ -35,8 +35,6 @@ class Upgrade7Test extends MigrateUpgradeExecuteTestBase { 'rdf', 'statistics', 'migration_provider_test', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php index 4a2ec634d0..1e951d0e47 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php @@ -23,8 +23,6 @@ class MigrateNodeTest extends MigrateNodeTestBase { 'language', 'content_translation', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php index 35976ee246..9dad3483f4 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php @@ -23,8 +23,6 @@ class NodeTranslationRedirectTest extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php index 8c04019bb0..07a3f93078 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeRevisionTest.php @@ -34,8 +34,6 @@ class MigrateNodeRevisionTest extends MigrateDrupal7TestBase { 'image', 'language', 'link', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'menu_ui', 'node', 'taxonomy', diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php index 8decc488b7..a6ea6eac08 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php @@ -29,8 +29,6 @@ class MigrateNodeTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php index 7b54d5b169..68f5903aa9 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php @@ -23,8 +23,6 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'text', 'user', diff --git a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php index 617fe73f0e..63a830c661 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php @@ -26,8 +26,6 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase { 'path', 'path_alias', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php index 9293980545..6d89f34574 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php @@ -18,8 +18,6 @@ class MigrateNodeCounterTest extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'statistics', 'text', diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php index 708f0a7b4d..14d83c5a98 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php @@ -18,8 +18,6 @@ class MigrateNodeCounterTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'statistics', 'text', diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php index 8472dc29f0..eba249a5bc 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php @@ -18,8 +18,6 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal6TestBase { 'config_translation', 'language', 'taxonomy', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php index d52cac6994..044a906544 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermLocalizedTranslationTest.php @@ -22,8 +22,6 @@ class MigrateTermLocalizedTranslationTest extends MigrateDrupal6TestBase { 'menu_ui', 'node', 'taxonomy', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php index 51efcd35d7..21e8fac702 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeTranslationTest.php @@ -20,7 +20,6 @@ class MigrateTermNodeTranslationTest extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', - 'migrate_drupal_multilingual', 'taxonomy', ]; diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php index ca40668e3e..827893c078 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTest.php @@ -21,8 +21,6 @@ class MigrateTaxonomyTermTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php index 95a5d22764..a9f215ff20 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyTermTranslationTest.php @@ -24,8 +24,6 @@ class MigrateTaxonomyTermTranslationTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php index 19b62b780b..27cb953413 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTaxonomyVocabularyTranslationTest.php @@ -17,8 +17,6 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal7TestBase { public static $modules = [ 'config_translation', 'language', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'taxonomy', 'text', ]; diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php index 06da1ad1df..d84c4be543 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateTermLocalizedTranslationTest.php @@ -19,8 +19,6 @@ class MigrateTermLocalizedTranslationTest extends MigrateDrupal7TestBase { public static $modules = [ 'content_translation', 'language', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'taxonomy', 'text', ]; diff --git a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php index c07fde4c81..205e974e5d 100644 --- a/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php +++ b/core/modules/user/tests/src/Kernel/Migrate/d7/MigrateUserTest.php @@ -26,8 +26,6 @@ class MigrateUserTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone',