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

Laravel 11.x Compatibility
spatie · Mar 4, 2024 · 8b4e6fa · 8b4e6fa
2 parents 0f666f3 + b5b123b
commit 8b4e6fa
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -2,23 +2,31 @@ name: run-tests
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
   pull_request:
-    branches: [main]
+    branches:
+      - main
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.1]
-        laravel: [10.*, 9.*, 8.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*']
         stability: [prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
+          - 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
@@ -18,17 +18,17 @@
     "require": {
         "php": "^8.1",
         "guzzlehttp/psr7": "^2.5",
-        "illuminate/contracts": "^10.0",
-        "illuminate/http": "^10.0",
+        "illuminate/contracts": "^10.0|^11.0",
+        "illuminate/http": "^10.0|^11.0",
         "laravel/prompts": "^0.1.1",
         "spatie/crawler": "^8.0",
         "spatie/laravel-package-tools": "^1.15"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.7",
         "meilisearch/meilisearch-php": "^1.1.1",
-        "nunomaduro/collision": "^7.5.2",
-        "orchestra/testbench": "^8.5.5",
+        "nunomaduro/collision": "^7.5.2|^8.0",
+        "orchestra/testbench": "^8.5.5|^9.0",
         "pestphp/pest": "^2.6.2",
         "pestphp/pest-plugin-laravel": "^2.0",
         "spatie/laravel-ray": "^1.32.4"