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

Laravel 11.x Compatibility
spatie · Feb 27, 2024 · 150e6cf · 150e6cf
2 parents f6fc6de + 8815bbc
commit 150e6cf
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 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.1, 8.2]
-        laravel: [9.*, 8.*, 10.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
@@ -23,6 +26,11 @@ jobs:
             testbench: 6.24
           - laravel: 9.*
             testbench: 7.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -17,20 +17,20 @@
     ],
     "require": {
         "php": "^8.1",
-        "illuminate/contracts": "^8.81|^9.0|^10.0",
+        "illuminate/contracts": "^8.81|^9.0|^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
-        "orchestra/testbench": "^7.0|^v6.24.1|^8.0",
+        "orchestra/testbench": "^7.0|^v6.24.1|^8.0|^9.0",
         "friendsofphp/php-cs-fixer": "^3.8",
-        "nunomaduro/collision": "^6.0|^5.0",
+        "nunomaduro/collision": "^6.0|^5.0|^8.0",
         "nunomaduro/larastan": "^2.0.1|^1.0.3",
-        "pestphp/pest": "^v1.21.3",
-        "pestphp/pest-plugin-laravel": "^1.1",
+        "pestphp/pest": "^v1.21.3|^2.34",
+        "pestphp/pest-plugin-laravel": "^1.1|^2.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.5|^10.5",
         "spatie/laravel-ray": "^1.26",
         "spatie/laravel-model-states": "^2.0",
         "spatie/enum": "^3.13",