From 283d9c908e4d63b328edea0ed841bc492b3b73fa Mon Sep 17 00:00:00 2001
From: "Barry vd. Heuvel" <barry@fruitcake.nl>
Date: Sun, 5 Feb 2023 16:10:01 +0100
Subject: [PATCH] Support Laravel 10 (#498)

---
 .editorconfig                   | 15 ++++++++++++++
 .github/workflows/run-tests.yml | 19 +++++-------------
 composer.json                   |  8 ++++----
 phpunit.xml.dist                | 35 +++++++++++----------------------
 4 files changed, 36 insertions(+), 41 deletions(-)
 create mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..9d49909
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = space
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
\ No newline at end of file
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index cb71af1..d584780 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -19,21 +19,12 @@ jobs:
 
     strategy:
       matrix:
-        php: [8.0, 7.4, 7.3, 7.2]
-        laravel: [8.*, 7.*, 6.*]
+        php: [8.2, 8.1, 8.0]
+        laravel: [10.*, 9.*]
         dependency-version: [prefer-lowest, prefer-stable]
-        include:
-          - laravel: 9.*
-            php: 8.1
-            dependency-version: prefer-stable
-          - laravel: 9.*
-            php: 8.0
-            dependency-version: prefer-lowest
         exclude:
-          - laravel: 8.*
-            php: 7.2
-          - php: 8.0
-            dependency-version: prefer-lowest
+          - laravel: 10.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 
@@ -60,4 +51,4 @@ jobs:
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
 
       - name: Execute Unit Tests
-        run: composer test
\ No newline at end of file
+        run: composer test
diff --git a/composer.json b/composer.json
index 41c1607..f3ce5ce 100644
--- a/composer.json
+++ b/composer.json
@@ -11,12 +11,12 @@
     ],
     "require": {
         "php": ">=7.2",
-        "illuminate/support": "^6|^7|^8|^9",
-        "illuminate/filesystem": "^6|^7|^8|^9",
-        "knplabs/knp-snappy": "^1"
+        "illuminate/support": "^9|^10",
+        "illuminate/filesystem": "^9|^10",
+        "knplabs/knp-snappy": "^1.4"
     },
     "require-dev": {
-        "orchestra/testbench": "^4|^5|^6|^7"
+        "orchestra/testbench": "^7|^8"
     },
     "autoload": {
         "psr-4": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 392a7a1..e4f26cf 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,24 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-            <directory>./tests/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
-</phpunit>
\ No newline at end of file
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnError="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <directory>./tests/</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>