From dcf5cf42059910242c31fc34d0ea147d07478473 Mon Sep 17 00:00:00 2001
From: Martin Kluska <martin@kluska.cz>
Date: Wed, 15 Mar 2023 22:02:42 +0100
Subject: [PATCH] Add Laravel 10 support + upgrade to PHPUnit 10

---
 .gitignore       |  1 +
 composer.json    | 10 +++++-----
 phpunit.xml.dist | 30 +++++++++++-------------------
 readme.md        | 14 ++++++--------
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9b19b9..6473415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ composer.lock
 /build
 .phpunit.result.cache
 .php_cs.cache
+/.phpunit.cache
diff --git a/composer.json b/composer.json
index 6e73b7b..b0ecb74 100644
--- a/composer.json
+++ b/composer.json
@@ -15,13 +15,13 @@
     "test": "./vendor/bin/phpunit"
   },
   "require": {
-    "illuminate/http": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
-    "illuminate/console": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
-    "illuminate/support": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0",
-    "illuminate/filesystem": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0"
+    "illuminate/http": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
+    "illuminate/console": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
+    "illuminate/support": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0",
+    "illuminate/filesystem": "5.2 - 5.8 | ^6.0 | ^7.0 | ^8.0 | ^9.0 | ^10.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.7 | 6.0 | 7.0 | 7.5 | 8.4 | ^8.5 | ^9.3",
+    "phpunit/phpunit": "5.7 | 6.0 | 7.0 | 7.5 | 8.4 | ^8.5 | ^9.3 | ^10.0",
     "mockery/mockery": "^1.1.0 | ^1.3.0",
     "friendsofphp/php-cs-fixer": "^2.16.0",
     "overtrue/phplint": "^1.1 | ^2.0"
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index da32b83..6d07324 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,21 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         bootstrap="vendor/autoload.php">
-    <testsuites>
-        <testsuite name="Application Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src/</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Application Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/readme.md b/readme.md
index 8766c3a..ccc05c8 100644
--- a/readme.md
+++ b/readme.md
@@ -69,14 +69,12 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for how to contribute changes. All contri
 
 > Laravel 5/6 should be still supported but we are not testing them via automation sccripts
 
-| Version | PHP         |
-| ------- | ----------- | 
-| 9.*     | 8.1-node-17 |
-| 9.*     | 8.0-node-17 |
-| 8.*     | 8.1-node-17 |
-| 8.*     | 8.0-node-17 |
-| 8.*     | 7.4-node-17 |
-| 7.*     | 7.4-node-17 |
+| Version | PHP           |
+|---------|---------------| 
+| 10.*    | 8.1, 8.2      |
+| 9.*     | 8.0, 8.1      |
+| 8.*     | 7.4, 8.0, 8.1 |
+| 7.*     | 7.4           |