Skip to content

Commit d89f7f2

Browse files
authored
Merge pull request #580 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 61114e2 + 004f4cf commit d89f7f2

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

.github/workflows/run-tests.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ jobs:
1212
fail-fast: true
1313
matrix:
1414
os: [ubuntu-latest]
15-
php: [8.3, 8.2]
16-
laravel: ['11.*']
15+
php: [8.4, 8.3, 8.2]
16+
laravel: ['11.*', '12.*']
1717
dependency-version: [prefer-lowest, prefer-stable]
1818

19-
2019
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
2120

2221
steps:
@@ -44,7 +43,7 @@ jobs:
4443

4544
- name: Install dependencies
4645
run: |
47-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" --no-interaction --no-update
46+
composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update
4847
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
4948
5049
- name: Execute tests

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
],
1818
"require": {
1919
"php": "^8.2",
20-
"illuminate/support": "^11.0",
20+
"illuminate/support": "^11.0|^12.0",
2121
"spatie/laravel-package-tools": "^1.9"
2222
},
2323
"require-dev": {
2424
"laravel/legacy-factories": "^1.0.4",
25-
"laravel/octane": "^2.5",
26-
"laravel/serializable-closure": "^1.1",
25+
"laravel/octane": "^2.5|dev-develop",
26+
"laravel/serializable-closure": "^1.1|^2.0",
2727
"mockery/mockery": "^1.4",
28-
"orchestra/testbench": "^9.0",
29-
"pestphp/pest": "^2.34",
28+
"orchestra/testbench": "^9.0|^10.0",
29+
"pestphp/pest": "^2.34|^3.7",
3030
"spatie/valuestore": "^1.2"
3131
},
3232
"autoload": {

0 commit comments

Comments
 (0)