Merge pull request #113 from laravel-shift/l10-compatibility

Laravel 10.x Compatibility
beyondcode · Feb 21, 2023 · 8353dcb · 8353dcb
2 parents 8c401d7 + 8a15139
commit 8353dcb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,12 +10,16 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.0, 8.1, 8.2]
-                laravel: [9.*, 8.*]
+                laravel: [9.*, 8.*, 10.*]
                 stability: [prefer-stable]
                 exclude:
+                    -   php: 8.0
+                        laravel: 10.*
                     -   php: 8.2
                         laravel: 8.*
                 include:
+                    -   laravel: 10.*
+                        testbench: 8.*
                     -   laravel: 9.*
                         testbench: 7.*
                     -   laravel: 8.*

diff --git a/composer.json b/composer.json
@@ -17,18 +17,18 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/container": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/database": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/log": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/routing": "^6.0|^7.0|^8.0|^9.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
+        "illuminate/container": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/log": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/routing": "^6.0|^7.0|^8.0|^9.0|^10.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
         "willdurand/email-reply-parser": "^2.8",
         "zbateson/mail-mime-parser": "^1.1"
     },
     "require-dev": {
         "laminas/laminas-mail": "^2.13",
         "mockery/mockery": "^1.2",
-        "orchestra/testbench": "^4.0|^5.0|^7.0",
+        "orchestra/testbench": "^4.0|^5.0|^7.0|^8.0",
         "phpunit/phpunit": "^7.0|^8.0|^9.3"
     },
     "autoload": {