Added support for PHPUnit v10 (#12)

umbrellio · Mar 23, 2023 · c0d8315 · c0d8315
1 parent d3633f8
commit c0d8315
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,10 +76,12 @@ jobs:
             redis_version: '6.0'
             php_versions: '8.1'
             laravel: '^9.0'
+            experimental: false
           - operating_system: ubuntu-latest
             redis_version: '6.0'
             php_versions: '8.2'
             laravel: '^10.0'
+            experimental: false
     runs-on: '${{ matrix.operating_system }}'
     services:
       redis:
@@ -135,7 +137,7 @@ jobs:
           REDIS_HOST: 127.0.0.1
           REDIS_PORT: 6379
         run: |
-          ./vendor/bin/phpunit --verbose --stderr --configuration phpunit.github.xml --coverage-clover build/logs/clover.xml --coverage-text
+          ./vendor/bin/phpunit --stderr --configuration phpunit.github.xml --coverage-clover build/logs/clover.xml --coverage-text
         working-directory: './'
       - name: Upload coverage results to Coveralls
         if: ${{ !matrix.experimental }}

diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     },
     "require-dev": {
         "umbrellio/code-style-php": "^1.0",
-        "phpunit/phpunit": "^8.3|^9.0",
+        "phpunit/phpunit": "^8.3|^9.0|^10.0",
         "php-coveralls/php-coveralls": "^2.1",
         "symplify/easy-coding-standard":  "^9.3.15",
         "orchestra/testbench": "^7.0|^8.0"

diff --git a/phpunit.github.xml b/phpunit.github.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="false"
-         convertWarningsToExceptions="false"
          processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Test suite">
             <directory suffix="Test.php">./tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="vendor/autoload.php"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnFailure="false">
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         cacheDirectory=".phpunit.cache"
+>
+    <coverage>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Test suite">
             <directory suffix="Test.php">./tests</directory>