From d4a7b550e468445a0a7354501796859e4856d363 Mon Sep 17 00:00:00 2001
From: Robert Jelen <robert.jelen@sharry.tech>
Date: Tue, 14 Mar 2023 20:03:10 +0100
Subject: [PATCH] Add support for Laravel 10 (#39)

---
 .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++
 composer.json            | 12 ++++++------
 phpunit.xml              | 10 +++++-----
 3 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d83f01af..227bb1c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,32 @@ on: [push]
 jobs:
   build-test:
     runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        php: [7.3, 7.4, 8.0, 8.1, 8.2]
+        laravel: [6.*, 7.*, 8.*, 9.*, 10.*]
+        exclude:
+          - laravel: 6.*
+            php: 8.1
+          - laravel: 6.*
+            php: 8.2
+          - laravel: 7.*
+            php: 8.1
+          - laravel: 7.*
+            php: 8.2
+          - laravel: 9.*
+            php: 7.3
+          - laravel: 9.*
+            php: 7.4
+          - laravel: 10.*
+            php: 7.3
+          - laravel: 10.*
+            php: 7.4
+          - laravel: 10.*
+            php: 8.0
+
+    name: PHP ${{ matrix.php }} on Laravel ${{ matrix.laravel }}
 
     steps:
     - uses: actions/checkout@v2
diff --git a/composer.json b/composer.json
index 8bb31957..f97cb517 100644
--- a/composer.json
+++ b/composer.json
@@ -11,9 +11,9 @@
     ],
     "require": {
 		"php": "^7.0|^8.0",
-        "illuminate/database": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/console": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
         "tmilos/scim-schema": "^0.1.0",
         "tmilos/scim-filter-parser": "^1.3"
     },
@@ -29,10 +29,10 @@
         }
     },
     "require-dev": {
-        "orchestra/testbench": "^5.0|^6.0",
+        "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0",
         "laravel/legacy-factories": "*"
     },
-    
+
     "extra": {
 	    "laravel": {
 	        "providers": [
@@ -43,5 +43,5 @@
 	        }
 	    }
 	}
-	
+
 }
diff --git a/phpunit.xml b/phpunit.xml
index 888a80d5..4888111e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd"
+         backupGlobals="false"
+         backupStaticProperties="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
          bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
 >
   <testsuites>
     <testsuite name="Unit tests">