Skip to content

Commit 43d6300

Browse files
authored
Merge pull request #252 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents daa1f6b + 486df2e commit 43d6300

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ jobs:
1313
matrix:
1414
os: [ubuntu-latest]
1515
php: [8.2]
16-
laravel: ['10.*', '11.*']
16+
laravel: ['10.*', '11.*', '12.*']
1717
dependency-version: [prefer-stable, prefer-lowest]
1818
include:
1919
- testbench: 8.*
2020
laravel: 10.*
2121
- testbench: 9.*
2222
laravel: 11.*
23+
- testbench: 10.*
24+
laravel: 12.*
2325

2426
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
2527

@@ -36,7 +38,7 @@ jobs:
3638

3739
- name: Install dependencies
3840
run: |
39-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
41+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
4042
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
4143
4244
- name: Execute tests

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
],
2424
"require": {
2525
"php": "^8.2",
26-
"illuminate/support": "^10.0|^11.0"
26+
"illuminate/support": "^10.0|^11.0|^12.0"
2727
},
2828
"require-dev": {
2929
"amphp/parallel": "^1.4.3|^2.2",
3030
"amphp/parallel-functions": "^1.1.0|^2.0",
3131
"mockery/mockery": "^1.6.2",
32-
"orchestra/testbench": "^8.5.9|^9.0",
33-
"pestphp/pest": "^2.0",
34-
"phpunit/phpunit": "10.2.2|^10.5",
32+
"orchestra/testbench": "^8.5.9|^9.0|^10.0",
33+
"pestphp/pest": "^2.0|^3.7",
34+
"phpunit/phpunit": "10.2.2|^10.5|^11.5.3",
3535
"spatie/laravel-ray": "^1.32.5",
3636
"symfony/stopwatch": "^6.3|^7.0"
3737
},

0 commit comments

Comments
 (0)