Merge pull request #3 from laravel-shift/l11-compatibility

Laravel 11.x Compatibility
spatie · Mar 8, 2024 · 24eb025 · 24eb025
2 parents f3a3301 + 3ad9ff3
commit 24eb025
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,19 +2,22 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
         php: [8.0, 8.1, 8.2]
-        laravel: [9.*, 8.*, 10.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
@@ -23,9 +26,15 @@ jobs:
             testbench: 7.*
           - laravel: 8.*
             testbench: ^6.23
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
           - laravel: 10.*
-            php: 8.0 
+            php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -18,12 +18,12 @@
     "require": {
         "php": "^8.0",
         "spatie/laravel-package-tools": "^1.4.3",
-        "illuminate/contracts": "^8.38|^9.0|^10.0"
+        "illuminate/contracts": "^8.38|^9.0|^10.0|^11.0"
     },
     "require-dev": {
-        "nunomaduro/collision": "^5.3|^6.0",
-        "orchestra/testbench": "^6.23|^7.0|^8.0",
-        "phpunit/phpunit": "^9.5",
+        "nunomaduro/collision": "^5.3|^6.0|^8.0",
+        "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.5|^10.5",
         "spatie/laravel-ray": "^1.28"
     },
     "autoload": {