Skip to content

Commit bcdb9f9

Browse files
authored
Merge pull request #86 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 9e03f33 + a67b5ca commit bcdb9f9

File tree

4 files changed

+22
-26
lines changed

4 files changed

+22
-26
lines changed

.github/workflows/lint.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ name: Lint
33
on:
44
push:
55
paths:
6-
- '**.php'
7-
- 'pint.json'
6+
- **.php
7+
- pint.json
88

99
jobs:
1010
lint:
1111
runs-on: ubuntu-latest
12+
1213
strategy:
13-
fail-fast: true
14-
matrix:
15-
php: [8.3]
14+
fail-fast: true
15+
matrix:
16+
php: ['8.2', 8.3, '8.3', '8.4']
1617

1718
steps:
1819
- uses: actions/checkout@v4
@@ -27,12 +28,12 @@ jobs:
2728
- name: Install composer dependencies
2829
uses: ramsey/composer-install@v3
2930
with:
30-
dependency-versions: "highest"
31+
dependency-versions: highest
3132

3233
- name: Run Pint
3334
run: ./vendor/bin/pint
3435

3536
- name: Commit linted files
3637
uses: stefanzweifel/git-auto-commit-action@v5
3738
with:
38-
commit_message: "Fixes coding style"
39+
commit_message: Fixes coding style

.github/workflows/phpstan.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ name: PHPStan
33
on:
44
push:
55
paths:
6-
- '**.php'
7-
- 'phpstan.neon.dist'
6+
- **.php
7+
- phpstan.neon.dist
88

99
jobs:
1010
phpstan:
1111
runs-on: ubuntu-latest
12+
1213
strategy:
13-
fail-fast: true
14-
matrix:
15-
php: [8.3]
14+
fail-fast: true
15+
matrix:
16+
php: ['8.2', 8.3, '8.3', '8.4']
1617

1718
steps:
1819
- uses: actions/checkout@v4
@@ -26,7 +27,7 @@ jobs:
2627
- name: Install composer dependencies
2728
uses: ramsey/composer-install@v3
2829
with:
29-
dependency-versions: "highest"
30+
dependency-versions: highest
3031

3132
- name: Run PHPStan
3233
run: ./vendor/bin/phpstan --error-format=github

.github/workflows/test.yml

+3-9
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,8 @@ jobs:
1515
matrix:
1616
os: [ubuntu-latest]
1717
php: ['8.2', '8.3', '8.4']
18-
laravel: ['11.*']
19-
stability: ['highest', 'lowest']
20-
# include:
21-
# - laravel: 11.*
22-
# testbench: 9.*
23-
# exclude:
24-
# - laravel: 11.*
25-
# php: '8.1'
18+
laravel: ['11.*', '12.*']
19+
stability: [highest, lowest]
2620

2721
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - ${{ matrix.stability }} stability
2822

@@ -37,7 +31,7 @@ jobs:
3731
coverage: none
3832

3933
- name: 🔨 Install composer dependencies
40-
uses: "ramsey/composer-install@v3"
34+
uses: ramsey/composer-install@v3
4135
with:
4236
dependency-versions: ${{ matrix.stability }}
4337

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
],
1616
"require": {
1717
"php": "^8.2",
18-
"illuminate/support": "^11.33.0",
19-
"illuminate/database": "^11.33.0",
20-
"illuminate/console": "^11.33.0"
18+
"illuminate/support": "^11.33.0|^12.0",
19+
"illuminate/database": "^11.33.0|^12.0",
20+
"illuminate/console": "^11.33.0|^12.0"
2121
},
2222
"require-dev": {
2323
"consolidation/robo": "^5.1.0",
2424
"larastan/larastan": "^3.0.2",
2525
"laravel/pint": "^1.18.3",
26-
"orchestra/testbench": "^9.6.1",
26+
"orchestra/testbench": "^9.6.1|^10.0",
2727
"phpstan/phpstan-deprecation-rules": "^2.0.1",
2828
"phpunit/phpunit": "^11.4.4",
2929
"totten/lurkerlite": "^1.3"

0 commit comments

Comments
 (0)