Skip to content

Commit 97b6eb1

Browse files
authored
Merge pull request #53 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 10e948f + 08f2998 commit 97b6eb1

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/run-tests.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
matrix:
1414
os: [ubuntu-latest]
1515
php: [8.2, 8.1, 8.0, 7.4]
16-
laravel: ['8.*', '9.*', '10.*', '11.*']
16+
laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
1717
dependency-version: [prefer-lowest, prefer-stable]
1818
include:
1919
- laravel: 10.*
@@ -24,6 +24,8 @@ 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
@@ -37,6 +39,12 @@ jobs:
3739
php: 8.0
3840
- laravel: 11.*
3941
php: 7.4
42+
- laravel: 12.*
43+
php: 8.1
44+
- laravel: 12.*
45+
php: 8.0
46+
- laravel: 12.*
47+
php: 7.4
4048

4149
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
4250

@@ -54,7 +62,7 @@ jobs:
5462
- name: Install dependencies
5563
run: |
5664
composer remove --dev friendsofphp/php-cs-fixer --no-interaction --no-update
57-
composer require "laravel/framework:${{ matrix.laravel }}" "nesbot/carbon:^2.63" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
65+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5866
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
5967
6068
- name: Execute tests

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
],
1818
"require": {
1919
"php": "^7.3|^8.0",
20-
"illuminate/support": "^8.0|^9.0|^10.0|^11.0"
20+
"illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0"
2121
},
2222
"require-dev": {
23-
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
24-
"pestphp/pest": "^1.22|^2.34"
23+
"orchestra/testbench": "^6.23|^7.0|^8.0|^9.0|^10.0",
24+
"pestphp/pest": "^1.22|^2.34|^3.0"
2525
},
2626
"autoload": {
2727
"psr-4": {

0 commit comments

Comments
 (0)