Tests: the unit tests now require PHPUnit 8+

Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>

Author: gsherwood

composer.json

@@ -36,7 +36,7 @@
         "ext-xmlwriter": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+        "phpunit/phpunit": "^8.0 || ^9.3.4"
     },
     "bin": [
         "bin/phpcbf",

tests/AllTests.php

@@ -11,23 +11,7 @@
 
 require_once 'Core/AllTests.php';
 require_once 'Standards/AllSniffs.php';
-
-// PHPUnit 7 made the TestSuite run() method incompatible with
-// older PHPUnit versions due to return type hints, so maintain
-// two different suite objects.
-$phpunit7 = false;
-if (class_exists('\PHPUnit\Runner\Version') === true) {
-    $version = \PHPUnit\Runner\Version::id();
-    if (version_compare($version, '7.0', '>=') === true) {
-        $phpunit7 = true;
-    }
-}
-
-if ($phpunit7 === true) {
-    include_once 'TestSuite7.php';
-} else {
-    include_once 'TestSuite.php';
-}
+require_once 'TestSuite.php';
 
 class PHP_CodeSniffer_AllTests
 {

tests/TestSuite.php

@@ -19,11 +19,11 @@ class TestSuite extends PHPUnit_TestSuite
     /**
      * Runs the tests and collects their result in a TestResult.
      *
-     * @param \PHPUnit\Framework\TestResult $result A test result.
+     * @param \PHPUnit\Framework\TestResult|null $result A test result.
      *
      * @return \PHPUnit\Framework\TestResult
      */
-    public function run(TestResult $result=null)
+    public function run(?TestResult $result=null): TestResult
     {
         $result = parent::run($result);
         printPHPCodeSnifferTestOutput();

tests/TestSuite7.php

@@ -42,23 +42,6 @@
 
 $tokens = new \PHP_CodeSniffer\Util\Tokens();
 
-// Compatibility for PHPUnit < 6 and PHPUnit 6+.
-if (class_exists('PHPUnit_Framework_TestSuite') === true && class_exists('PHPUnit\Framework\TestSuite') === false) {
-    class_alias('PHPUnit_Framework_TestSuite', 'PHPUnit'.'\Framework\TestSuite');
-}
-
-if (class_exists('PHPUnit_Framework_TestCase') === true && class_exists('PHPUnit\Framework\TestCase') === false) {
-    class_alias('PHPUnit_Framework_TestCase', 'PHPUnit'.'\Framework\TestCase');
-}
-
-if (class_exists('PHPUnit_TextUI_TestRunner') === true && class_exists('PHPUnit\TextUI\TestRunner') === false) {
-    class_alias('PHPUnit_TextUI_TestRunner', 'PHPUnit'.'\TextUI\TestRunner');
-}
-
-if (class_exists('PHPUnit_Framework_TestResult') === true && class_exists('PHPUnit\Framework\TestResult') === false) {
-    class_alias('PHPUnit_Framework_TestResult', 'PHPUnit'.'\Framework\TestResult');
-}
-
 
 /**
  * A global util function to help print unit test fixing data.