Upgrade phpunit

http-interop · Jul 20, 2021 · 062421d · 062421d
1 parent ec44ac6
commit 062421d
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.phpunit.result.cache
 composer.phar
 composer.lock
 phpunit.xml

diff --git a/composer.json b/composer.json
@@ -24,7 +24,7 @@
     },
     "require-dev": {
         "http-interop/http-factory-tests": "^0.9",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,4 +1,23 @@
-<phpunit backupGlobals="true" bootstrap="vendor/autoload.php" colors="true">
+<?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"
+        bootstrap="vendor/autoload.php"
+        colors="true">
+    <coverage>
+        <include>
+            <directory suffix=".php">src/</directory>
+        </include>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/phpunit/junit.xml"/>
+    </logging>
     <testsuites>
         <testsuite name="Integration tests">
             <directory>vendor/http-interop/http-factory-tests/test</directory>
@@ -12,14 +31,4 @@
         <const name="UPLOADED_FILE_FACTORY" value="Http\Factory\Guzzle\UploadedFileFactory"/>
         <const name="URI_FACTORY" value="Http\Factory\Guzzle\UriFactory"/>
     </php>
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-        </whitelist>
-    </filter>
-    <logging>
-        <log type="coverage-text" target="php://stdout"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
-        <log type="coverage-clover" target="build/logs/clover.xml"/>
-    </logging>
 </phpunit>