Skip to content

Commit

Permalink
Merge pull request #708 from crynobone/inertia-1-laravel-12
Browse files Browse the repository at this point in the history
[1.x] Supports Laravel 12
  • Loading branch information
joetannenbaum authored Feb 19, 2025
2 parents 7e6a030 + bf4eeb0 commit 206b1ba
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
19 changes: 16 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,37 +13,50 @@ jobs:
fail-fast: true
matrix:
php: [7.3, 7.4, "8.0", 8.1, 8.2, 8.3]
laravel: [8, 9, 10, 11]
laravel: [8, 9, 10, 11, 12]
stability: ["prefer-lowest", "prefer-stable"]
include:
- php: 8.4
laravel: 11
stability: "prefer-stable"
- php: 8.4
laravel: 12
stability: "prefer-stable"
exclude:
- php: 7.3
laravel: 8 # Failed security advisory
- php: 7.3
laravel: 9
- php: 7.3
laravel: 10
- php: 7.3
laravel: 11
- php: 7.3
laravel: 12
- php: 7.4
laravel: 9
- php: 7.4
laravel: 10
- php: 7.4
laravel: 11
- php: 7.4
laravel: 12
- php: '8.0'
laravel: 9 # Failed security advisory
- php: '8.0'
laravel: 10
- php: '8.0'
laravel: 11
- php: '8.0'
laravel: 12
- php: 8.1
laravel: 6
- php: 8.1
laravel: 7
- php: 8.1
laravel: 11
- php: 8.1
laravel: 12
- php: 8.2
laravel: 6
- php: 8.2
Expand Down Expand Up @@ -88,15 +101,15 @@ 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 phpunit/phpunit:^10.4 --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
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
"require": {
"php": "^7.3|~8.0.0|~8.1.0|~8.2.0|~8.3.0|~8.4.0",
"ext-json": "*",
"laravel/framework": "^8.74|^9.0|^10.0|^11.0",
"laravel/framework": "^8.74|^9.0|^10.0|^11.0|^12.0",
"symfony/console": "^5.3|^6.0|^7.0"
},
"require-dev": {
"roave/security-advisories": "dev-master",
"orchestra/testbench": "^6.45|^7.44|^8.25|^9.3",
"orchestra/testbench": "^6.45|^7.44|^8.25|^9.3|^10.0",
"mockery/mockery": "^1.3.3",
"phpunit/phpunit": "^8.0|^9.5.8|^10.4"
"phpunit/phpunit": "^8.0|^9.5.8|^10.4|^11.5"
},
"suggest": {
"ext-pcntl": "Recommended when running the Inertia SSR server via the `inertia:start-ssr` artisan command."
Expand Down

0 comments on commit 206b1ba

Please sign in to comment.