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 d087060a28..4078782143 100644 --- a/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php +++ b/core/modules/block/tests/src/Kernel/Migrate/d6/MigrateBlockContentTranslationTest.php @@ -26,6 +26,7 @@ class MigrateBlockContentTranslationTest extends MigrateDrupal6TestBase { 'language', '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 bee3633251..2847e35d5e 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,6 +19,7 @@ class MigrateCustomBlockContentTranslationTest extends MigrateDrupal6TestBase { 'block_content', 'content_translation', 'language', + // Required for translation migrations. 'migrate_drupal_multilingual', ]; 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 f67ba87dda..26d68eed99 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,6 +15,7 @@ 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 5e84616eb6..e420943264 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,6 +15,7 @@ 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 c7a065091e..5ff8402deb 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,6 +19,7 @@ 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 cd53f44ef9..033f22b9e8 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,6 +20,7 @@ class MigrateUserProfileFieldInstanceTranslationTest extends MigrateDrupal6TestB 'locale', 'language', 'field', + // 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 27e83ea504..3e32406d28 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,6 +20,7 @@ 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 10e22bd3ff..136e5331ec 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,6 +20,7 @@ class MigrateEntityTranslationSettingsTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'taxonomy', 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 2c920bbdce..8fab083230 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 @@ -20,6 +20,7 @@ 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 d590018749..d9b47b0592 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 @@ -20,6 +20,7 @@ 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 219122fb3f..e9913f6fa6 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 @@ -24,6 +24,7 @@ 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/src/MigrationConfigurationTrait.php b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php index 7f898cd80d..0349d87a77 100644 --- a/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php +++ b/core/modules/migrate_drupal/src/MigrationConfigurationTrait.php @@ -113,7 +113,7 @@ protected function getMigrations($database_state_key, $drupal_version) { // 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())); + throw new RequirementsException(sprintf("Install migrate_drupal_multilingual to run migration '%s'.", $migration->getPluginId())); } try { diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php index 46fc15f351..5225ce5d83 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php @@ -19,6 +19,7 @@ class FollowUpMigrationsTest extends MigrateNodeTestBase { 'content_translation', 'language', 'menu_ui', + // A requirement for d6_node_translation. 'migrate_drupal_multilingual', ]; diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php index a36db17510..5417df4772 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php @@ -26,6 +26,7 @@ class FollowUpMigrationsTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', + // A requirement for translation migrations. 'migrate_drupal_multilingual', 'node', 'taxonomy', diff --git a/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php index 37117fc02c..403ef351f3 100644 --- a/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php +++ b/core/modules/migrate_drupal_ui/src/Form/ReviewForm.php @@ -81,6 +81,7 @@ class ReviewForm extends MigrateUpgradeFormBase { 'fieldgroup', 'filefield_meta', 'help', + 'i18n', 'i18nstrings', 'imageapi', 'imageapi_gd', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nReviewPageTest.php index a4deaa25cf..adc3071e9e 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6I18nReviewPageTest.php @@ -102,6 +102,7 @@ protected function getAvailablePaths() { 'fieldgroup', 'filefield_meta', 'help', + 'i18n', 'i18nstrings', 'imageapi', 'imageapi_gd', @@ -133,7 +134,6 @@ protected function getMissingPaths() { 'devel', 'devel_generate', 'devel_node_access', - 'i18n', 'i18nblocks', 'i18ncck', 'i18ncontent', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6NoMultilingualTest.php index e9339a1e6a..5ede4db5d7 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6NoMultilingualTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6NoMultilingualTest.php @@ -151,6 +151,7 @@ protected function getAvailablePaths() { 'date_api', 'date_timezone', 'event', + 'i18n', 'i18nstrings', 'imageapi', 'number', @@ -165,7 +166,6 @@ protected function getAvailablePaths() { */ protected function getMissingPaths() { return [ - 'i18n', 'i18nblocks', 'i18ncck', 'i18ncontent', diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php index c8b6f71fcd..d2fe095b50 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6ReviewPageTest.php @@ -27,6 +27,7 @@ class MigrateUpgrade6ReviewPageTest extends MigrateUpgradeReviewPageTestBase { 'syslog', 'tracker', 'update', + // Required for translation migrations. 'migrate_drupal_multilingual', ]; diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php index 2d657eb8e7..96aa557917 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php @@ -31,6 +31,7 @@ class MigrateUpgrade6Test 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/MigrateUpgrade7NoMultilingualTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7NoMultilingualTest.php index 8eefd01740..bb40283a33 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7NoMultilingualTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7NoMultilingualTest.php @@ -2,10 +2,7 @@ namespace Drupal\Tests\migrate_drupal_ui\Functional\d7; -use Drupal\node\Entity\Node; use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeExecuteTestBase; -use Drupal\user\Entity\User; -use Drupal\Tests\WebAssert; /** * Tests Drupal 7 upgrade with translation requires migrate_drupal_multilingual. @@ -179,7 +176,6 @@ protected function getMissingPaths() { ]; } - /** * {@inheritdoc} */ diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php index 38d8a719ff..b7dba648eb 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7ReviewPageTest.php @@ -26,6 +26,7 @@ class MigrateUpgrade7ReviewPageTest extends MigrateUpgradeReviewPageTestBase { 'syslog', 'tracker', 'update', + // Required for translation migrations. 'migrate_drupal_multilingual', ]; diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php index f6c86662f3..b36b6eb0cc 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php @@ -31,6 +31,7 @@ class MigrateUpgrade7Test extends MigrateUpgradeExecuteTestBase { 'forum', '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 6b7b212d14..700311c871 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeTest.php @@ -23,6 +23,7 @@ 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 eb9f71d21a..f3d03166cf 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/NodeTranslationRedirectTest.php @@ -20,6 +20,7 @@ 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/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php index 6b9ce320c6..61a19bbf6d 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php @@ -31,6 +31,7 @@ class MigrateNodeTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'taxonomy', 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 c0c20df2f2..3e148aaf48 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php @@ -20,6 +20,7 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'text', 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 b657fcde38..28f22ecc95 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d6/MigrateUrlAliasTest.php @@ -21,6 +21,7 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase { 'content_translation', 'path', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', ]; diff --git a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php index 8ce2a5b33f..b8d92e0c49 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php @@ -18,6 +18,7 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'path', 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 5ebde7d723..29a35fb339 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d6/MigrateNodeCounterTest.php @@ -18,6 +18,7 @@ class MigrateNodeCounterTest extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'statistics', 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 f2bececc9b..1401e60fd4 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php @@ -18,6 +18,7 @@ class MigrateNodeCounterTest extends MigrateDrupal7TestBase { 'content_translation', 'language', 'menu_ui', + // Required for translation migrations. 'migrate_drupal_multilingual', 'node', 'statistics', 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 5b97f10fc9..9d7176c497 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTaxonomyVocabularyTranslationTest.php @@ -18,6 +18,7 @@ class MigrateTaxonomyVocabularyTranslationTest extends MigrateDrupal6TestBase { 'config_translation', 'language', 'taxonomy', + // Required for translation migrations. 'migrate_drupal_multilingual', ];