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

Laravel 12.x Compatibility
spatie · Feb 14, 2025 · e3d8f24 · e3d8f24
2 parents e172d81 + 1a2bc2b
commit e3d8f24
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -1,16 +1,18 @@
 name: run-tests
 
-on: [push, pull_request]
+on:
+  - push
+  - pull_request
 
 jobs:
   test:
-
     runs-on: ${{ matrix.os }}
+
     strategy:
       fail-fast: true
       matrix:
         php: [8.3, 8.2, 8.1, 8.0]
-        laravel: [11.*, 10.*, 9.*, 8.*]
+        laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
         os: [ubuntu-latest]
         dependency-version: [prefer-stable]
         include:
@@ -22,13 +24,19 @@ jobs:
             testbench: 7.*
           - laravel: 8.*
             testbench: ^6.23
+          - laravel: 12.*
+            testbench: 10.*
         exclude:
           - laravel: 11.*
             php: 8.1
           - laravel: 11.*
             php: 8.0
           - laravel: 10.*
             php: 8.0
+          - laravel: 12.*
+            php: 8.1
+          - laravel: 12.*
+            php: 8.0
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
 
@@ -45,7 +53,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
@@ -21,16 +21,16 @@
         "php": "^8.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^6.3|^7.3",
-        "illuminate/bus": "^8.50|^9.0|^10.0|^11.0",
-        "illuminate/queue": "^8.50|^9.0|^10.0|^11.0",
-        "illuminate/support": "^8.50|^9.0|^10.0|^11.0",
+        "illuminate/bus": "^8.50|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/queue": "^8.50|^9.0|^10.0|^11.0|^12.0",
+        "illuminate/support": "^8.50|^9.0|^10.0|^11.0|^12.0",
         "spatie/laravel-package-tools": "^1.11"
     },
     "require-dev": {
         "mockery/mockery": "^1.4.3",
-        "orchestra/testbench": "^6.19|^7.0|^8.0",
-        "pestphp/pest": "^1.22|^2.0",
-        "pestphp/pest-plugin-laravel": "^1.3|^2.0",
+        "orchestra/testbench": "^6.19|^7.0|^8.0|^10.0",
+        "pestphp/pest": "^1.22|^2.0|^3.0",
+        "pestphp/pest-plugin-laravel": "^1.3|^2.0|^3.0",
         "spatie/test-time": "^1.2.2"
     },
     "autoload": {