Skip to content

Commit 32e8014

Browse files
Merge pull request #709 from crynobone/inertia-2-laravel-12
[2.x] Supports Laravel 12
2 parents 655a37d + 9042b6e commit 32e8014

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Diff for: .github/workflows/tests.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
php: [8.1, 8.2, 8.3, 8.4]
16-
laravel: [10, 11]
16+
laravel: [10, 11, 12]
1717
stability: ["prefer-lowest", "prefer-stable"]
1818
exclude:
1919
- php: 8.4
2020
laravel: 10
2121
- php: 8.1
2222
laravel: 11
23+
- php: 8.1
24+
laravel: 12
2325

2426
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} (w/ ${{ matrix.stability }})
2527
steps:
@@ -52,16 +54,16 @@ jobs:
5254
max_attempts: 5
5355
command: |
5456
composer require nesbot/carbon:^2.62.1 --dev --${{ matrix.stability }} --no-update --no-interaction
55-
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest'
57+
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel < 12
5658

5759
- name: Set Minimum PHP 8.2 Versions and Laravel > 11
5860
uses: nick-fields/retry@v3
5961
with:
6062
timeout_minutes: 5
6163
max_attempts: 5
6264
command: |
63-
composer require orchestra/testbench:^9.2 --dev --${{ matrix.stability }} --no-update --no-interaction
64-
composer require phpunit/phpunit:^10.4 --dev --${{ matrix.stability }} --no-update --no-interaction
65+
composer require "orchestra/testbench:^9.2|^10.0" --dev --${{ matrix.stability }} --no-update --no-interaction
66+
composer require "phpunit/phpunit:^10.4|^11.5" --dev --${{ matrix.stability }} --no-update --no-interaction
6567
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11
6668

6769
- name: Set Laravel version

Diff for: composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
},
3636
"require-dev": {
3737
"roave/security-advisories": "dev-master",
38-
"orchestra/testbench": "^8.0|^9.2",
38+
"orchestra/testbench": "^8.0|^9.2|^10.0",
3939
"mockery/mockery": "^1.3.3",
40-
"phpunit/phpunit": "^10.4|^11.0",
40+
"phpunit/phpunit": "^10.4|^11.5",
4141
"laravel/pint": "^1.16"
4242
},
4343
"suggest": {

0 commit comments

Comments
 (0)