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

Laravel 10.x Compatibility
spatie · Jan 25, 2023 · 7117609 · 7117609
2 parents f9abfa9 + 5d4e2a0
commit 7117609
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -12,11 +12,16 @@ jobs:
         strategy:
             matrix:
                 php: [8.2, 8.1, 8.0]
-                laravel: [9.*]
+                laravel: [9.*, 10.*]
                 dependency-version: [prefer-lowest, prefer-stable]
                 include:
+                    - laravel: 10.*
+                      testbench: 8.*
                     - laravel: 9.*
                       testbench: 7.*
+                exclude:
+                    - laravel: 10.*
+                      php: 8.0                    
 
         name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -23,10 +23,10 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "illuminate/console": "^9.0",
-        "illuminate/database": "^9.0",
-        "illuminate/events": "^9.0",
-        "illuminate/support": "^9.0",
+        "illuminate/console": "^9.0|^10.0",
+        "illuminate/database": "^9.0|^10.0",
+        "illuminate/events": "^9.0|^10.0",
+        "illuminate/support": "^9.0|^10.0",
         "phpdocumentor/reflection-docblock": "^5.2",
         "spatie/better-types": "^0.1.2",
         "spatie/laravel-package-tools": "^1.9",
@@ -39,7 +39,7 @@
     "require-dev": {
         "laravel/horizon": "^5.7",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0",
+        "orchestra/testbench": "^7.0|^8.0",
         "pestphp/pest": "^1.22",
         "phpunit/phpunit": "^9.5.10",
         "spatie/fork": "^1.0",