Merge pull request #82 from laravel-shift/l12-compatibility

Laravel 12.x Compatibility
spatie · Feb 19, 2025 · 842edb8 · 842edb8
2 parents eff3a5c + fa31f06
commit 842edb8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         php: [8.2, 8.0, 8.1]
-        laravel: ['9.*', '10.*', '11.*']
+        laravel: ['9.*', '10.*', '11.*', '12.*']
         dependency-version: [prefer-lowest, prefer-stable]
         include:
           - laravel: 10.*
@@ -22,13 +22,19 @@ jobs:
             testbench: 7.*
           - laravel: 11.*
             testbench: 9.*
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 10.*
             php: 8.0
           - laravel: 11.*
             php: 8.0
           - laravel: 11.*
             php: 8.1
+          - laravel: 12.*
+            php: 8.0
+          - laravel: 12.*
+            php: 8.1
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -45,7 +51,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
           composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
 
       - name: Execute tests

diff --git a/composer.json b/composer.json
@@ -24,17 +24,17 @@
         "php": "^8.0",
         "ext-json": "*",
         "ext-zip": "*",
-        "illuminate/filesystem": "^9.0|^10.0|^11.0",
-        "illuminate/queue": "^9.0|^10.0|^11.0",
-        "illuminate/support": "^9.0|^10.0|^11.0",
+        "illuminate/filesystem": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/queue": "^9.0|^10.0|^11.0|^12.0",
+        "illuminate/support": "^9.0|^10.0|^11.0|^12.0",
         "nesbot/carbon": "^2.63|^3.0",
         "spatie/laravel-package-tools": "^1.9",
         "spatie/temporary-directory": "^2.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0.4",
         "mockery/mockery": "^1.4",
-        "orchestra/testbench": "^7.0|^8.0|^9.0",
+        "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
         "spatie/invade": "^1.0|^2.0"
     },
     "autoload": {