Revert "PHPUnit 9.3 introduced configuration changes - updated config and required version"

oojacoboo · oojacoboo · commit 8763682f5e71 · 2022-01-14T02:25:33.000-05:00
This reverts commit 9411f6b.
diff --git a/composer.json b/composer.json
@@ -40,7 +40,7 @@
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^0.12.94",
         "phpstan/phpstan-webmozart-assert": "^0.12.15",
-        "phpunit/phpunit": "^9.3",
+        "phpunit/phpunit": "^8.5.19||^9.5.8",
         "thecodingmachine/phpstan-strict-rules": "^0.12.1"
     },
     "suggest": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,33 +1,32 @@
 <?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="false"
-    backupStaticAttributes="false"
-    colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
-    processIsolation="false"
-    stopOnFailure="false"
-    bootstrap="tests/Bootstrap.php"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="tests/Bootstrap.php"
 >
-    <coverage processUncoveredFiles="true">
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-        <report>
-            <clover outputFile="build/logs/clover.xml"/>
-            <html outputDirectory="build/coverage"/>
-        </report>
-    </coverage>
-    
-    <testsuites>
-        <testsuite name="GraphQLite Test Suite">
-            <directory>./tests/</directory>
-            <exclude>./tests/Bootstrap.php</exclude>
-        </testsuite>
-    </testsuites>
-    <logging />
+  <testsuites>
+    <testsuite name="GraphQLite Test Suite">
+      <directory>./tests/</directory>
+      <exclude>./tests/Bootstrap.php</exclude>
+    </testsuite>
+  </testsuites>
+
+  <filter>
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src/</directory>
+    </whitelist>
+  </filter>
+  <logging>
+    <log type="coverage-html" target="build/coverage"/>
+    <log type="coverage-clover" target="build/logs/clover.xml"/>
+  </logging>
 </phpunit>
