Skip to content

Commit 5456a27

Browse files
authored
Merge pull request #153 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents dcb5abd + 0977c21 commit 5456a27

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,20 @@ jobs:
1717
matrix:
1818
os: [ubuntu-latest]
1919
php: [8.4, 8.3, 8.2, 8.1]
20-
laravel: ['10.*', '11.*']
20+
laravel: ['10.*', '11.*', '12.*']
2121
stability: [prefer-lowest, prefer-stable]
2222
include:
2323
- laravel: 10.*
2424
testbench: 8.*
2525
- laravel: 11.*
2626
testbench: 9.*
27+
- laravel: 12.*
28+
testbench: 10.*
2729
exclude:
2830
- laravel: 11.*
2931
php: 8.1
32+
- laravel: 12.*
33+
php: 8.1
3034

3135
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3236

@@ -62,7 +66,7 @@ jobs:
6266
6367
- name: Install dependencies
6468
run: |
65-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
69+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
6670
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
6771
6872
- name: Execute tests

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"require": {
1919
"php": "^8.1",
20-
"illuminate/support": "^10.0|^11.0",
20+
"illuminate/support": "^10.0|^11.0|^12.0",
2121
"league/flysystem": "^3.0",
2222
"spatie/db-dumper": "^3.3",
2323
"spatie/laravel-package-tools": "^1.6",
2424
"spatie/temporary-directory": "^2.0"
2525
},
2626
"require-dev": {
2727
"mockery/mockery": "^1.4",
28-
"orchestra/testbench": "^8.22.3|^9.0.4",
29-
"pestphp/pest-plugin-laravel": "^2.4",
30-
"phpunit/phpunit": "^10.5"
28+
"orchestra/testbench": "^8.22.3|^9.0.4|^10.0",
29+
"pestphp/pest-plugin-laravel": "^2.4|^3.1",
30+
"phpunit/phpunit": "^10.5|^11.5.3"
3131
},
3232
"autoload": {
3333
"psr-4": {

0 commit comments

Comments
 (0)