Skip to content

Commit 206b1ba

Browse files
Merge pull request #708 from crynobone/inertia-1-laravel-12
[1.x] Supports Laravel 12
2 parents 7e6a030 + bf4eeb0 commit 206b1ba

File tree

2 files changed

+19
-6
lines changed

2 files changed

+19
-6
lines changed

.github/workflows/tests.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,37 +13,50 @@ jobs:
1313
fail-fast: true
1414
matrix:
1515
php: [7.3, 7.4, "8.0", 8.1, 8.2, 8.3]
16-
laravel: [8, 9, 10, 11]
16+
laravel: [8, 9, 10, 11, 12]
1717
stability: ["prefer-lowest", "prefer-stable"]
1818
include:
1919
- php: 8.4
2020
laravel: 11
2121
stability: "prefer-stable"
22+
- php: 8.4
23+
laravel: 12
24+
stability: "prefer-stable"
2225
exclude:
26+
- php: 7.3
27+
laravel: 8 # Failed security advisory
2328
- php: 7.3
2429
laravel: 9
2530
- php: 7.3
2631
laravel: 10
2732
- php: 7.3
2833
laravel: 11
34+
- php: 7.3
35+
laravel: 12
2936
- php: 7.4
3037
laravel: 9
3138
- php: 7.4
3239
laravel: 10
3340
- php: 7.4
3441
laravel: 11
42+
- php: 7.4
43+
laravel: 12
3544
- php: '8.0'
3645
laravel: 9 # Failed security advisory
3746
- php: '8.0'
3847
laravel: 10
3948
- php: '8.0'
4049
laravel: 11
50+
- php: '8.0'
51+
laravel: 12
4152
- php: 8.1
4253
laravel: 6
4354
- php: 8.1
4455
laravel: 7
4556
- php: 8.1
4657
laravel: 11
58+
- php: 8.1
59+
laravel: 12
4760
- php: 8.2
4861
laravel: 6
4962
- php: 8.2
@@ -88,15 +101,15 @@ jobs:
88101
max_attempts: 5
89102
command: |
90103
composer require nesbot/carbon:^2.62.1 --dev --${{ matrix.stability }} --no-update --no-interaction
91-
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest'
104+
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel < 12
92105

93106
- name: Set Minimum PHP 8.2 Versions and Laravel > 11
94107
uses: nick-fields/retry@v3
95108
with:
96109
timeout_minutes: 5
97110
max_attempts: 5
98111
command: |
99-
composer require phpunit/phpunit:^10.4 --dev --${{ matrix.stability }} --no-update --no-interaction
112+
composer require "phpunit/phpunit:^10.4|^11.5" --dev --${{ matrix.stability }} --no-update --no-interaction
100113
if: matrix.php >= 8.2 && matrix.stability == 'prefer-lowest' && matrix.laravel >= 11
101114

102115
- name: Set Laravel version

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
"require": {
2828
"php": "^7.3|~8.0.0|~8.1.0|~8.2.0|~8.3.0|~8.4.0",
2929
"ext-json": "*",
30-
"laravel/framework": "^8.74|^9.0|^10.0|^11.0",
30+
"laravel/framework": "^8.74|^9.0|^10.0|^11.0|^12.0",
3131
"symfony/console": "^5.3|^6.0|^7.0"
3232
},
3333
"require-dev": {
3434
"roave/security-advisories": "dev-master",
35-
"orchestra/testbench": "^6.45|^7.44|^8.25|^9.3",
35+
"orchestra/testbench": "^6.45|^7.44|^8.25|^9.3|^10.0",
3636
"mockery/mockery": "^1.3.3",
37-
"phpunit/phpunit": "^8.0|^9.5.8|^10.4"
37+
"phpunit/phpunit": "^8.0|^9.5.8|^10.4|^11.5"
3838
},
3939
"suggest": {
4040
"ext-pcntl": "Recommended when running the Inertia SSR server via the `inertia:start-ssr` artisan command."

0 commit comments

Comments
 (0)