Skip to content

Commit 842edb8

Browse files
authored
Merge pull request #82 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents eff3a5c + fa31f06 commit 842edb8

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
os: [ubuntu-latest]
1515
php: [8.2, 8.0, 8.1]
16-
laravel: ['9.*', '10.*', '11.*']
16+
laravel: ['9.*', '10.*', '11.*', '12.*']
1717
dependency-version: [prefer-lowest, prefer-stable]
1818
include:
1919
- laravel: 10.*
@@ -22,13 +22,19 @@ jobs:
2222
testbench: 7.*
2323
- laravel: 11.*
2424
testbench: 9.*
25+
- laravel: 12.*
26+
testbench: 10.*
2527
exclude:
2628
- laravel: 10.*
2729
php: 8.0
2830
- laravel: 11.*
2931
php: 8.0
3032
- laravel: 11.*
3133
php: 8.1
34+
- laravel: 12.*
35+
php: 8.0
36+
- laravel: 12.*
37+
php: 8.1
3238

3339
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3440

@@ -45,7 +51,7 @@ jobs:
4551

4652
- name: Install dependencies
4753
run: |
48-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
54+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4955
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
5056
5157
- name: Execute tests

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
"php": "^8.0",
2525
"ext-json": "*",
2626
"ext-zip": "*",
27-
"illuminate/filesystem": "^9.0|^10.0|^11.0",
28-
"illuminate/queue": "^9.0|^10.0|^11.0",
29-
"illuminate/support": "^9.0|^10.0|^11.0",
27+
"illuminate/filesystem": "^9.0|^10.0|^11.0|^12.0",
28+
"illuminate/queue": "^9.0|^10.0|^11.0|^12.0",
29+
"illuminate/support": "^9.0|^10.0|^11.0|^12.0",
3030
"nesbot/carbon": "^2.63|^3.0",
3131
"spatie/laravel-package-tools": "^1.9",
3232
"spatie/temporary-directory": "^2.0"
3333
},
3434
"require-dev": {
3535
"laravel/legacy-factories": "^1.0.4",
3636
"mockery/mockery": "^1.4",
37-
"orchestra/testbench": "^7.0|^8.0|^9.0",
37+
"orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
3838
"spatie/invade": "^1.0|^2.0"
3939
},
4040
"autoload": {

0 commit comments

Comments
 (0)