Merge pull request #709 from crynobone/inertia-2-laravel-12

[2.x] Supports Laravel 12
inertiajs · Feb 19, 2025 · 32e8014 · 32e8014
2 parents 655a37d + 9042b6e
commit 32e8014
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,13 +13,15 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2, 8.3, 8.4]
-        laravel: [10, 11]
+        laravel: [10, 11, 12]
         stability: ["prefer-lowest", "prefer-stable"]
         exclude:
           - php: 8.4
             laravel: 10
           - php: 8.1
             laravel: 11
+          - php: 8.1
+            laravel: 12
 
     name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (w/ ${{ matrix.stability }})
     steps:
@@ -52,16 +54,16 @@ jobs:
           max_attempts: 5
           command: |
             composer require nesbot/carbon:^2.62.1 --dev --${{ matrix.stability }} --no-update --no-interaction
-        if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest'
+        if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel < 12
 
       - name: Set Minimum PHP 8.2 Versions and Laravel > 11
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: |
-            composer require orchestra/testbench:^9.2 --dev --${{ matrix.stability }} --no-update --no-interaction
-            composer require phpunit/phpunit:^10.4 --dev --${{ matrix.stability }} --no-update --no-interaction
+            composer require "orchestra/testbench:^9.2|^10.0" --dev --${{ matrix.stability }} --no-update --no-interaction
+            composer require "phpunit/phpunit:^10.4|^11.5" --dev --${{ matrix.stability }} --no-update --no-interaction
         if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11
 
       - name: Set Laravel version

diff --git a/composer.json b/composer.json
@@ -35,9 +35,9 @@
     },
     "require-dev": {
         "roave/security-advisories": "dev-master",
-        "orchestra/testbench": "^8.0|^9.2",
+        "orchestra/testbench": "^8.0|^9.2|^10.0",
         "mockery/mockery": "^1.3.3",
-        "phpunit/phpunit": "^10.4|^11.0",
+        "phpunit/phpunit": "^10.4|^11.5",
         "laravel/pint": "^1.16"
     },
     "suggest": {