Skip to content

Commit d621b27

Browse files
authored
Merge pull request #10 from justbetter/feature/laravel12
Laravel 12 support
2 parents f653c83 + f41904c commit d621b27

File tree

6 files changed

+29
-32
lines changed

6 files changed

+29
-32
lines changed

.github/workflows/analyse.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3]
13-
laravel: [10.*, 11.*]
12+
php: [8.3, 8.4]
13+
laravel: [11.*]
1414
stability: [prefer-stable]
1515
include:
16-
- laravel: 10.*
17-
testbench: 8.*
1816
- laravel: 11.*
1917
testbench: 9.*
2018

.github/workflows/coverage.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.3]
13-
laravel: [10.*, 11.*]
12+
php: [8.4]
13+
laravel: [11.*]
1414
stability: [prefer-stable]
1515
include:
16-
- laravel: 10.*
17-
testbench: 8.*
1816
- laravel: 11.*
1917
testbench: 9.*
2018

@@ -33,8 +31,7 @@ jobs:
3331

3432
- name: Install dependencies
3533
run: |
36-
composer config allow-plugins.pestphp/pest-plugin true
37-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" pestphp/pest --no-interaction --no-update
34+
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
3835
composer update --${{ matrix.stability }} --prefer-dist --no-interaction
3936
- name: Execute tests
40-
run: XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100
37+
run: composer coverage

.github/workflows/style.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Setup PHP
1717
uses: shivammathur/setup-php@v2
1818
with:
19-
php-version: 8.3
19+
php-version: 8.4
2020
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
2121
coverage: none
2222

.github/workflows/tests.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,12 @@ jobs:
99
fail-fast: true
1010
matrix:
1111
os: [ubuntu-latest]
12-
php: [8.1, 8.2, 8.3]
13-
laravel: [10.*, 11.*]
12+
php: [8.3, 8.4]
13+
laravel: [11.*]
1414
stability: [prefer-lowest, prefer-stable]
1515
include:
16-
- laravel: 10.*
17-
testbench: 8.*
1816
- laravel: 11.*
1917
testbench: 9.*
20-
exclude:
21-
- laravel: 11.*
22-
php: 8.1
2318

2419
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2520

composer.json

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,16 @@
1212
}
1313
],
1414
"require": {
15-
"php": "^8.1",
16-
"laravel/framework": "^10.0|^11.0"
15+
"php": "^8.3",
16+
"laravel/framework": "^11.0|^12.0"
1717
},
1818
"require-dev": {
19-
"larastan/larastan": "^2.9",
20-
"laravel/pint": "^1.6",
21-
"orchestra/testbench": "^8.0|^9.0",
22-
"phpstan/phpstan-mockery": "^1.1",
23-
"phpunit/phpunit": "^10.5"
19+
"larastan/larastan": "^3.0",
20+
"laravel/pint": "^1.20",
21+
"orchestra/testbench": "^9.0",
22+
"pestphp/pest": "^3.7",
23+
"phpstan/phpstan-mockery": "^2.0",
24+
"phpunit/phpunit": "^11.5"
2425
},
2526
"autoload": {
2627
"psr-4": {
@@ -34,17 +35,22 @@
3435
},
3536
"scripts": {
3637
"test": "phpunit",
37-
"analyse": "phpstan",
38+
"analyse": "phpstan --memory-limit=256M",
3839
"style": "pint --test",
3940
"fix-style": "pint",
4041
"quality": [
41-
"@test",
42+
"@style",
4243
"@analyse",
43-
"@style"
44-
]
44+
"@test",
45+
"@coverage"
46+
],
47+
"coverage": "XDEBUG_MODE=coverage php vendor/bin/pest --coverage --min=100"
4548
},
4649
"config": {
47-
"sort-packages": true
50+
"sort-packages": true,
51+
"allow-plugins": {
52+
"pestphp/pest-plugin": true
53+
}
4854
},
4955
"extra": {
5056
"laravel": {

phpstan.neon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ parameters:
77
- src
88
- tests
99
level: 8
10-
checkMissingIterableValueType: false
10+
ignoreErrors:
11+
- identifier: missingType.iterableValue

0 commit comments

Comments
 (0)