Laravel 11.x Compatibility (#521)

* Bump dependencies for Laravel 11 * Update GitHub Actions for Laravel 11
protonemedia · Mar 12, 2024 · 44f2608 · 44f2608
1 parent 03c9d36
commit 44f2608
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
@@ -1,23 +1,31 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 concurrency: ci-${{ github.ref }}
 
 jobs:
   test:
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         os: [ubuntu-20.04]
         php: [8.3, 8.2, 8.1]
-        laravel: [10.*]
+        laravel: ['10.*', '11.*']
         ffmpeg: [5.0, 4.4]
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
+        exclude:
+          - laravel: 11.*
+            php: 8.1
 
     name: ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - FF${{ matrix.ffmpeg }} - ${{ matrix.dependency-version }}
 

diff --git a/composer.json b/composer.json
@@ -21,17 +21,17 @@
     ],
     "require": {
         "php": "^8.1|^8.2|^8.3",
-        "illuminate/contracts": "^10.0",
+        "illuminate/contracts": "^10.0|^11.0",
         "php-ffmpeg/php-ffmpeg": "^1.2",
         "ramsey/collection": "^2.0"
     },
     "require-dev": {
         "league/flysystem-memory": "^3.10",
         "mockery/mockery": "^1.4.4",
-        "nesbot/carbon": "^2.66",
-        "orchestra/testbench": "^8.0",
+        "nesbot/carbon": "^2.66|^3.0",
+        "orchestra/testbench": "^8.0|^9.0",
         "phpunit/phpunit": "^10.4",
-        "spatie/image": "^2.2",
+        "spatie/image": "^2.2|^3.3",
         "spatie/phpunit-snapshot-assertions": "^5.0"
     },
     "autoload": {
@@ -63,4 +63,4 @@
             }
         }
     }
-}
+}