Skip to content

Commit 74fd0e7

Browse files
authored
Merge pull request #19 from erikn69/patch-6
Laravel 12 Support
2 parents 33dbd17 + 016f51d commit 74fd0e7

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

.github/workflows/psalm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: psalm
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2

.github/workflows/run-tests.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@ jobs:
1010
matrix:
1111
os: [ubuntu-latest]
1212
php: [7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
13-
laravel: [8.*, 9.*, 10.*, 11.*]
13+
laravel: [8.*, 9.*, 10.*, 11.*, 12.*]
1414
dependency-version: [prefer-lowest, prefer-stable]
1515
include:
1616
- laravel: 8.*
1717
testbench: ^6.24
1818
- laravel: 9.*
1919
testbench: 7.*
2020
- laravel: 10.*
21-
testbench: 8.*
21+
testbench: 8.*
2222
- laravel: 11.*
23-
testbench: 9.*
23+
testbench: 9.*
24+
- laravel: 12.*
25+
testbench: 10.*
2426
exclude:
2527
- laravel: 8.*
2628
php: 8.4
@@ -34,12 +36,18 @@ jobs:
3436
php: 7.4
3537
- laravel: 10.*
3638
php: 8.0
39+
- laravel: 11.*
40+
php: 7.4
3741
- laravel: 11.*
3842
php: 8.0
3943
- laravel: 11.*
4044
php: 8.1
41-
- laravel: 11.*
45+
- laravel: 12.*
4246
php: 7.4
47+
- laravel: 12.*
48+
php: 8.0
49+
- laravel: 12.*
50+
php: 8.1
4351

4452
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
4553

@@ -62,7 +70,7 @@ jobs:
6270

6371
- name: Install dependencies
6472
run: |
65-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.62.1" --no-interaction --no-update
73+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "nesbot/carbon:>=2.72.6" --no-interaction --no-update
6674
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest
6775
6876
- name: Execute tests

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"require": {
1919
"php": "^7.4|^8.0",
2020
"ext-json": "*",
21-
"illuminate/console": "^8.0|^9.0|^10.0|^11.0",
22-
"illuminate/contracts": "^8.0|^9.0|^10.0|^11.0",
23-
"illuminate/database": "^8.0|^9.0|^10.0|^11.0"
21+
"illuminate/console": "^8.0|^9.0|^10.0|^11.0|^12.0",
22+
"illuminate/contracts": "^8.0|^9.0|^10.0|^11.0|^12.0",
23+
"illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0"
2424
},
2525
"require-dev": {
2626
"mockery/mockery": "^1.4",
27-
"orchestra/testbench": "^6.24|^7.0|^8.0|^9.0",
27+
"orchestra/testbench": "^6.24|^7.0|^8.0|^9.0|^10.0",
2828
"pestphp/pest-plugin-laravel": "^1.3|^2.1|^3.0",
2929
"phpunit/phpunit": "^9.6|^10.5|^11.1",
3030
"spatie/temporary-directory": "^1.2",

0 commit comments

Comments
 (0)