Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Laravel 12 Upgrade #2755

Draft
wants to merge 7 commits into
base: 3.x
Choose a base branch
from
Draft

Laravel 12 Upgrade #2755

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
71e0867
Updated composer and workflow matrix to support Laravel 12.x - ref #2734
Braunson Mar 28, 2025
9b29faa
Updated test steps to switch PHP based on Laravel version
Braunson Mar 28, 2025
b6d1d87
Updated phpunit dep
Braunson Apr 1, 2025
aad16da
Fixed PHP reference
Braunson Apr 1, 2025
f23c278
Removed unnecessary step in GH workflow
Braunson Apr 1, 2025
06f3859
Update orchestra/testbench and testbench-dusk dependencies to support…
Braunson Apr 1, 2025
6b0c1f3
Update composer.json
Braunson Apr 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
matrix:
os: [ubuntu-latest]
php: [8.3, 8.2, 8.1]
laravel: [10.*, 11.*]
laravel: [10.*, 11.*, 12.*]
dbal: [3.*, 4.*]
exclude:
- laravel: 10.*
Expand All @@ -75,11 +75,15 @@ jobs:
php: 8.1
- laravel: 11.*
dbal: 3.*
- laravel: 12.*
php: 8.1
include:
- laravel: 10.*
testbench: 8.*
- laravel: 11.*
testbench: 9.*
- laravel: 12.*
testbench: 10.*

steps:
- name: Set timezone?
Expand Down Expand Up @@ -115,6 +119,16 @@ jobs:
restore-keys: |
${{ matrix.os }}-${{ matrix.laravel }}-${{ matrix.php }}-${{ matrix.dbal }}-composer-

- name: Adjust composer.json PHP requirement based on Laravel version
run: |
if [[ "${{ matrix.laravel }}" == "12.*" || "${{ matrix.laravel }}" == "11.*" ]]; then
composer config platform.php ${{ matrix.php }}
# For Laravel 11 and 12, keep the PHP ^8.2 requirement
else
# For Laravel 10, temporarily modify the composer.json to accept PHP 8.1
sed -i 's/"php": "\^8.2"/"php": "\^8.1"/g' composer.json
fi

- name: Install dependencies
run: |
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "doctrine/dbal:${{ matrix.dbal }}" --no-interaction --no-update
Expand Down
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@
"chat": "https://discord.gg/cnWk7EFv8R"
},
"require": {
"php": "^8.0",
"php": "^8.2",
"ext-json": "*",
"ext-pdo": "*",
"astrotomic/laravel-translatable": "^v11.12",
"cartalyst/tags": "^12.0 || ^13.0 || ^14.0",
"astrotomic/laravel-translatable": "^v11.16",
"cartalyst/tags": "^12.0 || ^13.0 || ^14.0 || ^15.0",
"doctrine/dbal": "^3.0 || ^4.0",
"guzzlehttp/guzzle": "^7.0",
"imgix/imgix-php": "^3.0",
"kalnoy/nestedset": "^6.0",
"laravel/framework": "^9.0 || ^10.0 || ^11.0",
"laravel/framework": "^9.0 || ^10.0 || ^11.0 || ^12.0",
"laravel/socialite": "^5.3",
"laravel/ui": "^4.0",
"league/flysystem-aws-s3-v3": "^3.0",
Expand Down
Loading