From 33630ea5925bba8beea96bf897269654e457f4cd Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Sat, 10 Feb 2024 18:14:13 +0000
Subject: [PATCH] Revert "Issue #3402444 by mondrake, Spokje, neclimdul, catch:
Deprecate Test Suites, no longer available in PHPUnit 10"
This reverts commit dccd32210fe5e07858dd1466fb770b24f2434a1b.
---
.../Drupal/Tests/Core/Test/PhpUnitCliTest.php | 6 ++----
.../Drupal/Tests/Core/Test/TestSuiteBaseTest.php | 16 ----------------
core/tests/TestSuites/BuildTestSuite.php | 9 ---------
.../TestSuites/FunctionalJavascriptTestSuite.php | 9 ---------
core/tests/TestSuites/FunctionalTestSuite.php | 9 ---------
core/tests/TestSuites/KernelTestSuite.php | 9 ---------
core/tests/TestSuites/TestSuiteBase.php | 10 ----------
core/tests/TestSuites/UnitTestSuite.php | 9 ---------
8 files changed, 2 insertions(+), 75 deletions(-)
diff --git a/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php b/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
index 5c98cbd5880f..0931f20e0279 100644
--- a/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php
@@ -21,14 +21,12 @@ public function testPhpUnitListTests() {
// The goal here is to successfully generate the list, without any
// duplicate namespace errors or so forth. This keeps us from committing
// tests which don't break under run-tests.sh, but do break under the
- // PHPUnit CLI test runner tool.
+ // phpunit test runner tool.
$process = Process::fromShellCommandline('vendor/bin/phpunit --configuration core --verbose --list-tests');
$process->setWorkingDirectory($this->root)
->setTimeout(300)
->setIdleTimeout(300);
- // We disable deprecations since we do not care about them in this test,
- // and deprecated classes will trigger an error when loading.
- $process->run(NULL, ['SYMFONY_DEPRECATIONS_HELPER' => 'disabled']);
+ $process->run();
$this->assertEquals(0, $process->getExitCode(),
'COMMAND: ' . $process->getCommandLine() . "\n" .
'OUTPUT: ' . $process->getOutput() . "\n" .
diff --git a/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php b/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php
index 1f53f981775e..2589132ca2f8 100644
--- a/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php
+++ b/core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php
@@ -7,7 +7,6 @@
use Drupal\Tests\TestSuites\TestSuiteBase;
use org\bovigo\vfs\vfsStream;
use PHPUnit\Framework\TestCase;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
// The test suite class is not part of the autoloader, we need to include it
// manually.
@@ -20,8 +19,6 @@
*/
class TestSuiteBaseTest extends TestCase {
- use ExpectDeprecationTrait;
-
/**
* Helper method to set up the file system.
*
@@ -84,16 +81,11 @@ public function provideCoreTests() {
/**
* Tests for special case behavior of unit test suite namespaces in core.
*
- * @group legacy
- *
* @covers ::addTestsBySuiteNamespace
*
* @dataProvider provideCoreTests
*/
public function testAddTestsBySuiteNamespaceCore($filesystem, $suite_namespace, $expected_tests) {
-
- $this->expectDeprecation('Drupal\\Tests\\Core\\Test\\StubTestSuiteBase is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829');
-
// Set up the file system.
$vfs = vfsStream::setup('root');
vfsStream::create($filesystem, $vfs);
@@ -126,8 +118,6 @@ public function testLocalTimeZone() {
*
* We use this class to alter the behavior of TestSuiteBase so it can be
* testable.
- *
- * @phpstan-ignore-next-line
*/
class StubTestSuiteBase extends TestSuiteBase {
@@ -138,12 +128,6 @@ class StubTestSuiteBase extends TestSuiteBase {
*/
public $testFiles = [];
- public function __construct(string $name) {
- @trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
- // @phpstan-ignore-next-line
- parent::__construct($name);
- }
-
/**
* {@inheritdoc}
*/
diff --git a/core/tests/TestSuites/BuildTestSuite.php b/core/tests/TestSuites/BuildTestSuite.php
index c743820021bf..39c4660c7aae 100644
--- a/core/tests/TestSuites/BuildTestSuite.php
+++ b/core/tests/TestSuites/BuildTestSuite.php
@@ -4,19 +4,10 @@
namespace Drupal\Tests\TestSuites;
-@trigger_error('\Drupal\Tests\TestSuites\BuildTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
-
require_once __DIR__ . '/TestSuiteBase.php';
/**
* Discovers tests for the build test suite.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
- *
- * @phpstan-ignore-next-line
*/
class BuildTestSuite extends TestSuiteBase {
diff --git a/core/tests/TestSuites/FunctionalJavascriptTestSuite.php b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
index 1c4c4315e3e3..d026e725e82a 100644
--- a/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
+++ b/core/tests/TestSuites/FunctionalJavascriptTestSuite.php
@@ -4,19 +4,10 @@
namespace Drupal\Tests\TestSuites;
-@trigger_error('\Drupal\Tests\TestSuites\FunctionalJavascriptTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
-
require_once __DIR__ . '/TestSuiteBase.php';
/**
* Discovers tests for the functional-javascript test suite.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
- *
- * @phpstan-ignore-next-line
*/
class FunctionalJavascriptTestSuite extends TestSuiteBase {
diff --git a/core/tests/TestSuites/FunctionalTestSuite.php b/core/tests/TestSuites/FunctionalTestSuite.php
index 1cf5d9945aa0..1ddbde2b32e4 100644
--- a/core/tests/TestSuites/FunctionalTestSuite.php
+++ b/core/tests/TestSuites/FunctionalTestSuite.php
@@ -4,19 +4,10 @@
namespace Drupal\Tests\TestSuites;
-@trigger_error('\Drupal\Tests\TestSuites\FunctionalTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
-
require_once __DIR__ . '/TestSuiteBase.php';
/**
* Discovers tests for the functional test suite.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
- *
- * @phpstan-ignore-next-line
*/
class FunctionalTestSuite extends TestSuiteBase {
diff --git a/core/tests/TestSuites/KernelTestSuite.php b/core/tests/TestSuites/KernelTestSuite.php
index a9936df922d6..1fb4be33f4c3 100644
--- a/core/tests/TestSuites/KernelTestSuite.php
+++ b/core/tests/TestSuites/KernelTestSuite.php
@@ -4,19 +4,10 @@
namespace Drupal\Tests\TestSuites;
-@trigger_error('\Drupal\Tests\TestSuites\KernelTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
-
require_once __DIR__ . '/TestSuiteBase.php';
/**
* Discovers tests for the kernel test suite.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
- *
- * @phpstan-ignore-next-line
*/
class KernelTestSuite extends TestSuiteBase {
diff --git a/core/tests/TestSuites/TestSuiteBase.php b/core/tests/TestSuites/TestSuiteBase.php
index c2236293da9f..70ee9f7c5a1f 100644
--- a/core/tests/TestSuites/TestSuiteBase.php
+++ b/core/tests/TestSuites/TestSuiteBase.php
@@ -9,19 +9,9 @@
/**
* Base class for Drupal test suites.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
*/
abstract class TestSuiteBase extends TestSuite {
- public function __construct($theClass = '', string $name = '') {
- @trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
- parent::__construct($theClass, $name);
- }
-
/**
* Finds extensions in a Drupal installation.
*
diff --git a/core/tests/TestSuites/UnitTestSuite.php b/core/tests/TestSuites/UnitTestSuite.php
index 2daf44f7052a..c24d8f85b94f 100644
--- a/core/tests/TestSuites/UnitTestSuite.php
+++ b/core/tests/TestSuites/UnitTestSuite.php
@@ -4,19 +4,10 @@
namespace Drupal\Tests\TestSuites;
-@trigger_error('\Drupal\Tests\TestSuites\UnitTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
-
require_once __DIR__ . '/TestSuiteBase.php';
/**
* Discovers tests for the unit test suite.
- *
- * @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
- * replacement and test discovery will be handled differently in PHPUnit 10.
- *
- * @see https://www.drupal.org/node/3405829
- *
- * @phpstan-ignore-next-line
*/
class UnitTestSuite extends TestSuiteBase {
--
GitLab