Skip to content

Commit 6ec68f8

Browse files
authored
Merge pull request #112 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 356cb39 + efaeab6 commit 6ec68f8

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
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: true
1313
matrix:
1414
php: [8.4, 8.3, 8.2, 8.1, 8.0]
15-
laravel: ['9.*', '10.*', '11.*']
15+
laravel: ['9.*', '10.*', '11.*', '12.*']
1616
dependency-version: [prefer-stable]
1717
include:
1818
- laravel: 9.*
@@ -21,13 +21,19 @@ jobs:
2121
testbench: ^8.0
2222
- laravel: 11.*
2323
testbench: ^9.0
24+
- laravel: 12.*
25+
testbench: ^10.0
2426
exclude:
2527
- laravel: 10.*
2628
php: 8.0
2729
- laravel: 11.*
2830
php: 8.1
2931
- laravel: 11.*
3032
php: 8.0
33+
- laravel: 12.*
34+
php: 8.1
35+
- laravel: 12.*
36+
php: 8.0
3137

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

@@ -44,7 +50,7 @@ jobs:
4450

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

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535
],
3636
"require": {
3737
"php": "^8.0",
38-
"laravel/framework": "^8.0|^9.0|^10.0|^11.0"
38+
"laravel/framework": "^8.0|^9.0|^10.0|^11.0|^12.0"
3939
},
4040
"require-dev": {
4141
"mockery/mockery": "^1.4",
42-
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
43-
"pestphp/pest": "^1.22|^2.34",
44-
"pestphp/pest-plugin-laravel": "^1.3|^2.3"
42+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0",
43+
"pestphp/pest": "^1.22|^2.34|^3.7",
44+
"pestphp/pest-plugin-laravel": "^1.3|^2.3|^3.1"
4545
},
4646
"autoload": {
4747
"psr-4": {

0 commit comments

Comments
 (0)