Skip to content

Commit 6681a48

Browse files
authored
Merge pull request #131 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 2889962 + 9eb7eed commit 6681a48

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
fail-fast: true
1313
matrix:
1414
os: [ubuntu-latest]
15-
php: [8.2, 8.1, 8.0]
16-
laravel: ['8.*', '9.*', '10.*', '11.*']
15+
php: [8.4, 8.3, 8.2, 8.1, 8.0]
16+
laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
1717
dependency-version: [prefer-lowest, prefer-stable]
1818
include:
1919
- laravel: 10.*
@@ -24,13 +24,19 @@ jobs:
2424
testbench: ^6.23
2525
- laravel: 11.*
2626
testbench: 9.*
27+
- laravel: 12.*
28+
testbench: 10.*
2729
exclude:
2830
- laravel: 10.*
2931
php: 8.0
3032
- laravel: 11.*
3133
php: 8.1
3234
- laravel: 11.*
3335
php: 8.0
36+
- laravel: 12.*
37+
php: 8.1
38+
- laravel: 12.*
39+
php: 8.0
3440

3541
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3642

@@ -54,7 +60,7 @@ jobs:
5460

5561
- name: Install dependencies
5662
run: |
57-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
63+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5864
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
5965
6066
- name: Execute tests

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
],
1818
"require": {
1919
"php": "^8.0",
20-
"laravel/framework": "^8.0|^9.0|^10.0|^11.0",
20+
"laravel/framework": "^8.0|^9.0|^10.0|^11.0|^12.0",
2121
"spatie/image-optimizer": "^1.2.0"
2222
},
2323
"require-dev": {
24-
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
25-
"phpunit/phpunit": "^9.4|^10.5"
24+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0",
25+
"phpunit/phpunit": "^9.4|^10.5|^11.5.3"
2626
},
2727
"autoload": {
2828
"psr-4": {

0 commit comments

Comments
 (0)