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

Laravel 10.x Compatibility
spatie · Jan 24, 2023 · 5908f58 · 5908f58
2 parents 6e5e71b + 4e4940d
commit 5908f58
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,12 +10,18 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.2, 8.1, 8.0]
-                laravel: [9.*]
+                laravel: [9.*, 10.*]
                 stability: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 10.*
+                      testbench: 8.*
+                      carbon: ^2.63
                     - laravel: 9.*
                       testbench: 7.*
                       carbon: ^2.63
+                exclude:
+                    - laravel: 10.*
+                      php: 8.0                         
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -21,15 +21,15 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/database": "^9.0",
-        "illuminate/http": "^9.0",
-        "illuminate/support": "^9.0",
+        "illuminate/database": "^9.0|^10.0",
+        "illuminate/http": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
         "spatie/laravel-package-tools": "^1.11"
     },
     "require-dev": {
         "ext-json": "*",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "spatie/laravel-ray": "^1.28",
         "pestphp/pest": "^1.20"
     },