From 39246dc7681dcee1fd008c7319989b0fa9cf40b5 Mon Sep 17 00:00:00 2001
From: Tim MacDonald <hello@timacdonald.me>
Date: Fri, 17 Feb 2023 14:58:17 +1100
Subject: [PATCH] wip

---
 .github/workflows/main.yml   |  4 ++++
 .gitignore                   |  1 +
 phpunit.9.xml                | 19 +++++++++++++++++++
 phpunit.xml.dist             | 10 ++--------
 vendor-bin/dev/composer.json |  4 ++--
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 phpunit.9.xml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 287677d..f136191 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -94,6 +94,10 @@ jobs:
         if: ${{ matrix.php == 8.1 && matrix.prefer == 'prefer-lowest' }}
         run: composer require --no-update --no-scripts phpunit/phpunit:">=9.0" symfony/http-foundation:">=5.3.7" illuminate/http:">=8.62.0" nesbot/carbon:">=2.51.0"
 
+      - name: Setup PHPUnit configuration
+        if: matrix.phpunit == '^9.0'
+        run: cp --force phpunit.9.xml.dist phpunit.xml.dist
+
       - name: Install dependencies
         run: |
           composer require --no-update 'illuminate/support:${{ matrix.laravel }}' 'orchestra/testbench:${{ matrix.testbench }}'
diff --git a/.gitignore b/.gitignore
index bba50a0..670384e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /vendor
 /composer.lock
 /.phpunit.result.cache
+/.phpunit.cache
 /.php_cs.cache
 /coverage
 /infection.log
diff --git a/phpunit.9.xml b/phpunit.9.xml
new file mode 100644
index 0000000..7be71c4
--- /dev/null
+++ b/phpunit.9.xml
@@ -0,0 +1,19 @@
+<?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"
+    bootstrap="vendor/autoload.php"
+    executionOrder="depends,defects"
+    beStrictAboutOutputDuringTests="true"
+    verbose="true"
+>
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="default">
+      <directory suffix="Test.php">tests</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7be71c4..9bc8818 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,12 +1,6 @@
 <?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"
-    bootstrap="vendor/autoload.php"
-    executionOrder="depends,defects"
-    beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-  <coverage processUncoveredFiles="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" bootstrap="vendor/autoload.php" executionOrder="depends,defects" beStrictAboutOutputDuringTests="true" cacheDirectory=".phpunit.cache">
+  <coverage>
     <include>
       <directory suffix=".php">src</directory>
     </include>
diff --git a/vendor-bin/dev/composer.json b/vendor-bin/dev/composer.json
index 560ec47..70e830f 100644
--- a/vendor-bin/dev/composer.json
+++ b/vendor-bin/dev/composer.json
@@ -2,9 +2,9 @@
     "require": {
         "friendsofphp/php-cs-fixer": "^3.6",
         "infection/infection": "^0.26.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^8.0",
         "phpstan/phpstan": "^1.4",
-        "phpunit/phpunit": "^9.5"
+        "phpunit/phpunit": "^10.0"
     },
     "config": {
         "allow-plugins": {