Merge pull request #38 from finndev/main

l11 support
spatie · Mar 12, 2024 · 7775dab · 7775dab
2 parents 98f0e71 + 52e75e8
commit 7775dab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [ ubuntu-latest ]
         php: [ 8.2, 8.1, 8.0 ]
-        laravel: [ 10.*, 9.*, 8.* ]
+        laravel: [ 11.*, 10.*, 9.*, 8.* ]
         dependency-version: [ prefer-lowest, prefer-stable ]
         include:
           - laravel: 8.*
@@ -19,9 +19,15 @@ jobs:
             testbench: 7.*
           - laravel: 10.*
             testbench: 8.*
+          - laravel: 11.*
+            testbench: 9.*
         exclude:
           - laravel: 10.*
             php: 8.0
+          - laravel: 11.*
+            php: 8.0
+          - laravel: 11.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 

diff --git a/composer.json b/composer.json
@@ -23,15 +23,14 @@
     ],
     "require": {
         "php": "^8.0",
-        "illuminate/contracts": "^8.73|^9.0|^10.0",
+        "illuminate/contracts": "^8.73|^9.0|^10.0|^11.0",
         "spatie/laravel-package-tools": "^1.9.2"
     },
     "require-dev": {
-        "nesbot/carbon": "^2.63",
+        "nesbot/carbon": "^2.63|^3.0",
         "doctrine/dbal": "^3.6",
-        "orchestra/testbench": "^6.23|^7.0|^8.0",
-        "phpunit/phpunit": "^9.4",
-        "vimeo/psalm": "^4.12"
+        "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+        "phpunit/phpunit": "^9.4|^10.0"
     },
     "autoload": {
         "psr-4": {