Raise minimum PHPUnit version

Author: mmoll

composer.json

@@ -35,7 +35,7 @@
         "phan/phan": "^5.4.5",
         "phpstan/phpstan": "^1.12",
         "phpstan/phpstan-strict-rules": "^1.6",
-        "phpunit/phpunit": "^8.5.36 || ^9.6.15",
+        "phpunit/phpunit": "^9.6.15",
         "psalm/plugin-phpunit": "^0.19",
         "sabre/event": ">= 5.1.6",
         "symfony/filesystem": ">= 5.4.45",

phpunit.xml.dist

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
         backupGlobals="true"
         beStrictAboutTestsThatDoNotTestAnything="false"
         bootstrap="tests/bootstrap.php"
@@ -9,9 +11,9 @@
             <file>vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php</file>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="false">
+    <coverage processUncoveredFiles="false">
+        <include>
             <directory suffix=".php">./MO4/Sniffs</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 </phpunit>

tests/bootstrap.php

@@ -43,20 +43,3 @@ static function ($v) use ($myStandardName): bool {
 );
 
 putenv("PHPCS_IGNORE_TESTS={$ignoredStandardsStr}");
-
-/*
- * PHPUnit 9.3 is the first version which supports Xdebug 3, but we're using older versions.
- *
- * For now, until a fix is pulled into the whole stack, this will allow older PHPUnit
- * versions to run with Xdebug 3 for code coverage.
- */
-
-if ((true === extension_loaded('xdebug')) && (true === version_compare((string) phpversion('xdebug'), '3', '>='))) {
-    if (false === defined('XDEBUG_CC_UNUSED')) {
-        define('XDEBUG_CC_UNUSED', null);
-    }
-
-    if (false === defined('XDEBUG_CC_DEAD_CODE')) {
-        define('XDEBUG_CC_DEAD_CODE', null);
-    }
-}