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

Laravel 11.x Compatibility
swisnl · Mar 27, 2024 · 09b73a9 · 09b73a9
2 parents 343a9b5 + 6439d73
commit 09b73a9
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 15 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,6 +1,8 @@
 name: Run tests
 
-on: [ push, pull_request ]
+on:
+  - push
+  - pull_request
 
 jobs:
   php-tests:
@@ -9,22 +11,40 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: [ '7.4', '8.0', '8.1' ]
-        laravel: [ '6.*', '7.*', '8.*', '9.*', '10.*' ]
-        stability: [ prefer-lowest, prefer-stable ]
+        php: ['7.4', '8.0', '8.1', '8.2', '8.3']
+        laravel: ['6.*', '7.*', '8.*', '9.*', '10.*', '11.*']
+        stability: [prefer-lowest, prefer-stable]
         exclude:
-          - laravel: '6.*'
+          - laravel: 6.*
             php: '8.1'
-          - laravel: '7.*'
+          - laravel: 6.*
+            php: '8.2'
+          - laravel: 6.*
+            php: '8.3'
+          - laravel: 7.*
             php: '8.1'
-          - laravel: '8.*'
-            php: '8.1'
-          - laravel: '9.*'
+          - laravel: 7.*
+            php: '8.2'
+          - laravel: 7.*
+            php: '8.3'
+          - laravel: 8.*
+            php: '8.2'
+          - laravel: 8.*
+            php: '8.3'
+          - laravel: 9.*
+            php: '7.4'
+          - laravel: 9.*
+            php: '8.3'
+          - laravel: 10.*
             php: '7.4'
-          - laravel: '10.*'
+          - laravel: 10.*
+            php: '8.0'
+          - laravel: 11.*
             php: '7.4'
-          - laravel: '10.*'
+          - laravel: 11.*
             php: '8.0'
+          - laravel: 11.*
+            php: '8.1'
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
 

diff --git a/composer.json b/composer.json
@@ -18,10 +18,10 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0",
-        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0"
+        "illuminate/console": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+        "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",