From 93b747d5e3f13dc80426d9891f34c94afe179278 Mon Sep 17 00:00:00 2001 From: Lee Rowlands <lee.rowlands@previousnext.com.au> Date: Wed, 21 Feb 2024 10:28:31 +1000 Subject: [PATCH] Issue #3261652 by larowlan, smustgrave, quietone, Spokje, paulocs: Deprecate Forum module in Drupal 10 --- core/modules/forum/forum.info.yml | 2 ++ core/modules/forum/tests/src/Functional/ForumBlockTest.php | 1 + core/modules/forum/tests/src/Functional/ForumIndexTest.php | 1 + core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php | 1 + core/modules/forum/tests/src/Functional/ForumTermAccessTest.php | 1 + core/modules/forum/tests/src/Functional/ForumTest.php | 1 + core/modules/forum/tests/src/Functional/ForumUninstallTest.php | 2 ++ core/modules/forum/tests/src/Functional/GenericTest.php | 1 + .../forum/tests/src/Functional/Module/DependencyTest.php | 1 + core/modules/forum/tests/src/Functional/NodeAccessPagerTest.php | 1 + .../forum/tests/src/Functional/UrlAlterFunctionalTest.php | 1 + .../forum/tests/src/Functional/Views/ForumIntegrationTest.php | 1 + .../migrate_drupal/d6/NoMultilingualReviewPageTest.php | 1 + .../tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php | 1 + .../migrate_drupal/d7/NoMultilingualReviewPageTest.php | 1 + .../tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php | 1 + core/modules/forum/tests/src/Kernel/ForumValidationTest.php | 1 + .../tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php | 1 + .../forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php | 1 + .../tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php | 1 + .../src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php | 1 + .../src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php | 1 + .../src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php | 1 + core/modules/forum/tests/src/Unit/ForumManagerTest.php | 1 + .../forum/tests/src/Unit/ForumUninstallValidatorTest.php | 1 + 25 files changed, 27 insertions(+) diff --git a/core/modules/forum/forum.info.yml b/core/modules/forum/forum.info.yml index d57a37abef1d..6aa532a208ac 100644 --- a/core/modules/forum/forum.info.yml +++ b/core/modules/forum/forum.info.yml @@ -10,3 +10,5 @@ dependencies: package: Core version: VERSION configure: forum.overview +lifecycle: deprecated +lifecycle_link: "https://www.drupal.org/node/3223395#s-forum" diff --git a/core/modules/forum/tests/src/Functional/ForumBlockTest.php b/core/modules/forum/tests/src/Functional/ForumBlockTest.php index 121102a63412..7ec29089daaa 100644 --- a/core/modules/forum/tests/src/Functional/ForumBlockTest.php +++ b/core/modules/forum/tests/src/Functional/ForumBlockTest.php @@ -11,6 +11,7 @@ * Tests the forum blocks. * * @group forum + * @group legacy */ class ForumBlockTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/ForumIndexTest.php b/core/modules/forum/tests/src/Functional/ForumIndexTest.php index 7631d224a601..07ef0cca1e2b 100644 --- a/core/modules/forum/tests/src/Functional/ForumIndexTest.php +++ b/core/modules/forum/tests/src/Functional/ForumIndexTest.php @@ -8,6 +8,7 @@ * Tests the forum index listing. * * @group forum + * @group legacy */ class ForumIndexTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php b/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php index cefacf48bd15..bead0a0c515f 100644 --- a/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php +++ b/core/modules/forum/tests/src/Functional/ForumNodeAccessTest.php @@ -9,6 +9,7 @@ * Tests forum block view for private node access. * * @group forum + * @group legacy */ class ForumNodeAccessTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/ForumTermAccessTest.php b/core/modules/forum/tests/src/Functional/ForumTermAccessTest.php index 944b37241ce0..acbd0966665c 100644 --- a/core/modules/forum/tests/src/Functional/ForumTermAccessTest.php +++ b/core/modules/forum/tests/src/Functional/ForumTermAccessTest.php @@ -9,6 +9,7 @@ * Tests forum taxonomy terms for access. * * @group forum + * @group legacy */ class ForumTermAccessTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php index 0053d288b271..cb7702f1c7fa 100644 --- a/core/modules/forum/tests/src/Functional/ForumTest.php +++ b/core/modules/forum/tests/src/Functional/ForumTest.php @@ -17,6 +17,7 @@ * consistency in the database. * * @group forum + * @group legacy * @group #slow */ class ForumTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/ForumUninstallTest.php b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php index 3f7efed06548..bb7c92281cbf 100644 --- a/core/modules/forum/tests/src/Functional/ForumUninstallTest.php +++ b/core/modules/forum/tests/src/Functional/ForumUninstallTest.php @@ -14,6 +14,7 @@ * Tests forum module uninstallation. * * @group forum + * @group legacy * @group #slow */ class ForumUninstallTest extends BrowserTestBase { @@ -133,6 +134,7 @@ public function testForumUninstallWithField() { // Double check everything by reinstalling the forum module again. $this->drupalGet('admin/modules'); $this->submitForm(['modules[forum][enable]' => 1], 'Install'); + $this->submitForm([], 'Continue'); $this->assertSession()->pageTextContains('Module Forum has been installed.'); } diff --git a/core/modules/forum/tests/src/Functional/GenericTest.php b/core/modules/forum/tests/src/Functional/GenericTest.php index 999f8f35297b..a7ba33e1649f 100644 --- a/core/modules/forum/tests/src/Functional/GenericTest.php +++ b/core/modules/forum/tests/src/Functional/GenericTest.php @@ -8,6 +8,7 @@ * Generic module test for forum. * * @group forum + * @group legacy */ class GenericTest extends GenericModuleTestBase { diff --git a/core/modules/forum/tests/src/Functional/Module/DependencyTest.php b/core/modules/forum/tests/src/Functional/Module/DependencyTest.php index d5ce99f83f86..36a3d71d59b1 100644 --- a/core/modules/forum/tests/src/Functional/Module/DependencyTest.php +++ b/core/modules/forum/tests/src/Functional/Module/DependencyTest.php @@ -8,6 +8,7 @@ * Enable module without dependency enabled. * * @group form + * @group legacy */ class DependencyTest extends ModuleTestBase { diff --git a/core/modules/forum/tests/src/Functional/NodeAccessPagerTest.php b/core/modules/forum/tests/src/Functional/NodeAccessPagerTest.php index ea680684ef3b..4d6c1ab38535 100644 --- a/core/modules/forum/tests/src/Functional/NodeAccessPagerTest.php +++ b/core/modules/forum/tests/src/Functional/NodeAccessPagerTest.php @@ -8,6 +8,7 @@ * Tests access controlled node views have the right amount of comment pages. * * @group form + * @group legacy */ class NodeAccessPagerTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/UrlAlterFunctionalTest.php b/core/modules/forum/tests/src/Functional/UrlAlterFunctionalTest.php index d11ca467380f..09c566bfb668 100644 --- a/core/modules/forum/tests/src/Functional/UrlAlterFunctionalTest.php +++ b/core/modules/forum/tests/src/Functional/UrlAlterFunctionalTest.php @@ -10,6 +10,7 @@ * Tests altering the inbound path and the outbound path. * * @group form + * @group legacy */ class UrlAlterFunctionalTest extends BrowserTestBase { diff --git a/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php b/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php index a1f98ac2583a..0b4b9624b55d 100644 --- a/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php +++ b/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php @@ -10,6 +10,7 @@ * Tests the forum integration into views. * * @group forum + * @group legacy */ class ForumIntegrationTest extends ViewTestBase { diff --git a/core/modules/forum/tests/src/Functional/migrate_drupal/d6/NoMultilingualReviewPageTest.php b/core/modules/forum/tests/src/Functional/migrate_drupal/d6/NoMultilingualReviewPageTest.php index efe269284e8e..2f3d8b001584 100644 --- a/core/modules/forum/tests/src/Functional/migrate_drupal/d6/NoMultilingualReviewPageTest.php +++ b/core/modules/forum/tests/src/Functional/migrate_drupal/d6/NoMultilingualReviewPageTest.php @@ -8,6 +8,7 @@ * Tests migrate upgrade review page. * * @group forum + * @group legacy */ class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase { diff --git a/core/modules/forum/tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php b/core/modules/forum/tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php index fa0303026fdc..229b92fff7b5 100644 --- a/core/modules/forum/tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php +++ b/core/modules/forum/tests/src/Functional/migrate_drupal/d6/Upgrade6Test.php @@ -11,6 +11,7 @@ * * @group forum * @group #slow + * @group legacy */ class Upgrade6Test extends MigrateUpgradeExecuteTestBase { diff --git a/core/modules/forum/tests/src/Functional/migrate_drupal/d7/NoMultilingualReviewPageTest.php b/core/modules/forum/tests/src/Functional/migrate_drupal/d7/NoMultilingualReviewPageTest.php index e541601cbe67..fced783ee1ca 100644 --- a/core/modules/forum/tests/src/Functional/migrate_drupal/d7/NoMultilingualReviewPageTest.php +++ b/core/modules/forum/tests/src/Functional/migrate_drupal/d7/NoMultilingualReviewPageTest.php @@ -10,6 +10,7 @@ * The test method is provided by the MigrateUpgradeTestBase class. * * @group forum + * @group legacy */ class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase { diff --git a/core/modules/forum/tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php b/core/modules/forum/tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php index 2ff0f78bd4e6..a6e0c3211ecc 100644 --- a/core/modules/forum/tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php +++ b/core/modules/forum/tests/src/Functional/migrate_drupal/d7/Upgrade7Test.php @@ -11,6 +11,7 @@ * * @group forum * @group #slow + * @group legacy */ class Upgrade7Test extends MigrateUpgradeExecuteTestBase { diff --git a/core/modules/forum/tests/src/Kernel/ForumValidationTest.php b/core/modules/forum/tests/src/Kernel/ForumValidationTest.php index e7e52e285ba4..c173adb4840e 100644 --- a/core/modules/forum/tests/src/Kernel/ForumValidationTest.php +++ b/core/modules/forum/tests/src/Kernel/ForumValidationTest.php @@ -10,6 +10,7 @@ * Tests forum validation constraints. * * @group forum + * @group legacy */ class ForumValidationTest extends EntityKernelTestBase { diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php index 9eb416c4523e..04e4d838503c 100644 --- a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php +++ b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumConfigsTest.php @@ -9,6 +9,7 @@ * Upgrade variables to forum.settings.yml. * * @group migrate_drupal_6 + * @group legacy */ class MigrateForumConfigsTest extends MigrateDrupal6TestBase { diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php index 86e3126bd0c6..e32fb6210ade 100644 --- a/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php +++ b/core/modules/forum/tests/src/Kernel/Migrate/d6/MigrateForumTest.php @@ -13,6 +13,7 @@ * Tests forum migration from Drupal 6 to Drupal 8. * * @group migrate_drupal_6 + * @group legacy */ class MigrateForumTest extends MigrateNodeTestBase { diff --git a/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php index 7f9f47dc20af..6171c258483b 100644 --- a/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php +++ b/core/modules/forum/tests/src/Kernel/Migrate/d7/MigrateForumSettingsTest.php @@ -8,6 +8,7 @@ * Tests migration of Forum's variables to configuration. * * @group forum + * @group legacy */ class MigrateForumSettingsTest extends MigrateDrupal7TestBase { diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php index 185455e9e030..aa769e9b6fc2 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php @@ -13,6 +13,7 @@ /** * @coversDefaultClass \Drupal\forum\Breadcrumb\ForumBreadcrumbBuilderBase * @group forum + * @group legacy */ class ForumBreadcrumbBuilderBaseTest extends UnitTestCase { diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php index 269c13f44764..6e4b4d89d619 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumListingBreadcrumbBuilderTest.php @@ -15,6 +15,7 @@ /** * @coversDefaultClass \Drupal\forum\Breadcrumb\ForumListingBreadcrumbBuilder * @group forum + * @group legacy */ class ForumListingBreadcrumbBuilderTest extends UnitTestCase { diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php index de013135980d..5912342fcbac 100644 --- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php +++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumNodeBreadcrumbBuilderTest.php @@ -15,6 +15,7 @@ /** * @coversDefaultClass \Drupal\forum\Breadcrumb\ForumNodeBreadcrumbBuilder * @group forum + * @group legacy */ class ForumNodeBreadcrumbBuilderTest extends UnitTestCase { diff --git a/core/modules/forum/tests/src/Unit/ForumManagerTest.php b/core/modules/forum/tests/src/Unit/ForumManagerTest.php index e61dcbf07f3b..eb6da8998170 100644 --- a/core/modules/forum/tests/src/Unit/ForumManagerTest.php +++ b/core/modules/forum/tests/src/Unit/ForumManagerTest.php @@ -11,6 +11,7 @@ /** * @coversDefaultClass \Drupal\forum\ForumManager * @group forum + * @group legacy */ class ForumManagerTest extends UnitTestCase { diff --git a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php index d07bc5f9f969..19ebe9ccb9ef 100644 --- a/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php +++ b/core/modules/forum/tests/src/Unit/ForumUninstallValidatorTest.php @@ -10,6 +10,7 @@ /** * @coversDefaultClass \Drupal\forum\ForumUninstallValidator * @group forum + * @group legacy */ class ForumUninstallValidatorTest extends UnitTestCase { -- GitLab