From 6f1a617a7d49963877f44a432795b702959acde1 Mon Sep 17 00:00:00 2001 From: catch Date: Fri, 4 Feb 2022 11:52:57 +0000 Subject: [PATCH] Issue #3261957 by longwave, quietone, andypost: Properly deprecate migrate_drupal_multilingual for future removal (cherry picked from commit 258c8371610e4a82f97b29c7207f5d8b5d759d52) --- .../src/Kernel/d6/FollowUpMigrationsTest.php | 2 -- .../src/Kernel/d7/FollowUpMigrationsTest.php | 2 -- .../migrate_drupal_multilingual.info.yml | 3 ++- .../migrate_drupal_multilingual.install | 23 ------------------- .../migrate_drupal_multilingual.module | 21 ----------------- .../NoMultilingualReviewPageTestBase.php | 2 -- .../src/Functional/d6/IdConflictTest.php | 2 -- .../d6/MultilingualReviewPageTest.php | 2 +- .../d6/NoMultilingualReviewPageTest.php | 3 +-- .../src/Functional/d6/NodeClassicTest.php | 2 -- .../src/Functional/d7/IdConflictTest.php | 2 -- .../d7/MultilingualReviewPageTest.php | 2 +- .../Migrate/d6/MigrateNodeCompleteTest.php | 2 -- .../Migrate/d7/MigrateNodeCompleteTest.php | 2 -- .../Kernel/Migrate/d7/MigrateUrlAliasTest.php | 1 - .../Migrate/d7/MigrateMenuTranslationTest.php | 2 -- .../Migrate/d6/MigrateTermNodeComplete.php | 2 -- 17 files changed, 5 insertions(+), 70 deletions(-) delete mode 100644 core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install delete mode 100644 core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module 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 aebafb0d272..0e6a82a3021 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d6/FollowUpMigrationsTest.php @@ -19,8 +19,6 @@ 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 8bc137416e8..eee1a0bd593 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php @@ -27,8 +27,6 @@ class FollowUpMigrationsTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // A requirement for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', 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 c7379afda47..91e5093a72f 100644 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml +++ b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.info.yml @@ -2,7 +2,8 @@ name: 'Migrate Drupal Multilingual' type: module description: 'Provides a requirement for multilingual migrations.' package: 'Core (Experimental)' -lifecycle: experimental +lifecycle: obsolete +lifecycle_link: https://www.drupal.org/node/3080264 version: VERSION dependencies: - drupal:migrate_drupal diff --git a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install deleted file mode 100644 index 7256494eece..00000000000 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.install +++ /dev/null @@ -1,23 +0,0 @@ - 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_multilingual/migrate_drupal_multilingual.module b/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module deleted file mode 100644 index 82ff699f84a..00000000000 --- a/core/modules/migrate_drupal_multilingual/migrate_drupal_multilingual.module +++ /dev/null @@ -1,21 +0,0 @@ -' . t('About') . ''; - $output .= '

' . t('The Migrate Drupal Multilingual module is a requirement for migrating translations. It does not provide a user interface. For more information, see the online documentation for the Migrate Drupal Multilingual module.', [':migrate_drupal_multilingual' => 'https://www.drupal.org/node/2959712']) . '

'; - return $output; - } -} diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php b/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php index 06cf0b48ec9..05b15189cda 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php @@ -4,8 +4,6 @@ namespace Drupal\Tests\migrate_drupal_ui\Functional; /** * Tests the upgrade review form without translations. - * - * When using this test class, do not enable migrate_drupal_multilingual. */ abstract class NoMultilingualReviewPageTestBase extends MultilingualReviewPageTestBase { diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php index bf75e753ebb..554c1005ad7 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/IdConflictTest.php @@ -24,8 +24,6 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase { 'migrate_drupal_ui', 'statistics', 'telephone', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** 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 f859da871d1..1a400a28248 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 @@ -9,7 +9,7 @@ use Drupal\Tests\migrate_drupal_ui\Functional\MultilingualReviewPageTestBase; /** * Tests migrate upgrade review page for Drupal 6. * - * Tests with translation modules and migrate_drupal_multilingual enabled. + * Tests with translation modules enabled. * * @group migrate_drupal_6 * @group migrate_drupal_ui diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php index b679fa911f1..fcd7a9ae7d8 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php @@ -9,8 +9,7 @@ use Drupal\Tests\migrate_drupal_ui\Functional\NoMultilingualReviewPageTestBase; /** * Tests migrate upgrade review page for Drupal 6 without translations. * - * Tests with the translation modules and migrate_drupal_multilingual module - * disabled. + * Tests with the translation modules disabled. * * @group migrate_drupal_6 * @group migrate_drupal_ui diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php index c751ff5531f..ab8d1b6ca61 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/NodeClassicTest.php @@ -31,8 +31,6 @@ class NodeClassicTest extends MigrateUpgradeExecuteTestBase { 'book', 'forum', 'statistics', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php index 0b0dc58ec9b..8e9fc0e2b8d 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/IdConflictTest.php @@ -24,8 +24,6 @@ class IdConflictTest extends MigrateUpgradeExecuteTestBase { 'migrate_drupal_ui', 'statistics', 'telephone', - // 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 978e1be1687..ecf3c1a18f4 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 @@ -9,7 +9,7 @@ use Drupal\Tests\migrate_drupal_ui\Functional\MultilingualReviewPageTestBase; /** * Tests migrate upgrade review page for Drupal 7. * - * Tests with translation modules and migrate_drupal_multilingual enabled. + * Tests with translation modules enabled. * * @group migrate_drupal_7 * @group migrate_drupal_ui diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php index 324feb7cd70..1630f2f2164 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateNodeCompleteTest.php @@ -23,8 +23,6 @@ class MigrateNodeCompleteTest extends MigrateNodeTestBase { 'language', 'content_translation', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php index 3f5039c9a9c..381513ed0ac 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeCompleteTest.php @@ -34,8 +34,6 @@ class MigrateNodeCompleteTest extends MigrateDrupal7TestBase { 'language', 'link', 'menu_ui', - // Required for translation migrations. - 'migrate_drupal_multilingual', 'node', 'taxonomy', 'telephone', 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 e29d74b9614..e4b323f3991 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php @@ -15,7 +15,6 @@ class MigrateUrlAliasTest extends MigrateUrlAliasTestBase { protected static $modules = [ 'path_alias', 'content_translation', - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTranslationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTranslationTest.php index 2f08e26d81e..dce5d57339a 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTranslationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateMenuTranslationTest.php @@ -20,8 +20,6 @@ class MigrateMenuTranslationTest extends MigrateDrupal7TestBase { 'language', 'locale', 'menu_link_content', - // Required for translation migrations. - 'migrate_drupal_multilingual', ]; /** diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php index 97beb2de196..4ae2aff6736 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d6/MigrateTermNodeComplete.php @@ -20,8 +20,6 @@ class MigrateTermNodeComplete extends MigrateDrupal6TestBase { 'content_translation', 'language', 'menu_ui', - // A requirement for d6_node_translation. - 'migrate_drupal_multilingual', 'taxonomy', ];