Skip to content

Commit 5ba6a27

Browse files
authored
Merge pull request #23 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 8b8c5ba + e494884 commit 5ba6a27

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

.github/workflows/run-tests.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,22 @@ name: run-tests
22

33
on:
44
push:
5-
branches: [main]
5+
branches:
6+
- main
67
pull_request:
7-
branches: [main]
8+
branches:
9+
- main
810

911
jobs:
1012
test:
1113
runs-on: ${{ matrix.os }}
14+
1215
strategy:
1316
fail-fast: true
1417
matrix:
1518
os: [ubuntu-latest, windows-latest]
1619
php: [8.3, 8.2, 8.1]
17-
laravel: [11.*, 10.*, 9.*]
20+
laravel: ['9.*', '10.*', '11.*', '12.*']
1821
stability: [prefer-lowest, prefer-stable]
1922
include:
2023
- laravel: 11.*
@@ -23,9 +26,13 @@ jobs:
2326
testbench: 8.*
2427
- laravel: 9.*
2528
testbench: 7.*
29+
- laravel: 12.*
30+
testbench: 10.*
2631
exclude:
2732
- php: 8.1
2833
laravel: 11.*
34+
- laravel: 12.*
35+
php: 8.1
2936

3037
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3138

composer.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,20 @@
1717
],
1818
"require": {
1919
"php": "^8.1",
20-
"illuminate/contracts": "^9.0 || ^10.0 || ^11.0",
21-
"illuminate/database": "^9.0 || ^10.0 || ^11.0",
22-
"illuminate/support": "^9.0 || ^10.0 || ^11.0",
20+
"illuminate/contracts": "^9.0 || ^10.0 || ^11.0 || ^12.0",
21+
"illuminate/database": "^9.0 || ^10.0 || ^11.0 || ^12.0",
22+
"illuminate/support": "^9.0 || ^10.0 || ^11.0 || ^12.0",
2323
"nesbot/carbon": "^2.66 || ^3.6",
2424
"spatie/laravel-package-tools": "^1.13.0"
2525
},
2626
"require-dev": {
2727
"nunomaduro/larastan": "^2.0.1",
28-
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0",
29-
"pestphp/pest": "^1.22 || ^2.0",
30-
"pestphp/pest-plugin-laravel": "^1.22 || ^2.0",
28+
"orchestra/testbench": "^7.0 || ^8.0 || ^9.0 || ^10.0",
29+
"pestphp/pest": "^1.22 || ^2.0 || ^3.7",
30+
"pestphp/pest-plugin-laravel": "^1.22 || ^2.0 || ^3.1",
3131
"phpstan/extension-installer": "^1.1",
32-
"phpstan/phpstan-deprecation-rules": "^1.0",
33-
"phpstan/phpstan-phpunit": "^1.0",
32+
"phpstan/phpstan-deprecation-rules": "^1.0 || ^2.0",
33+
"phpstan/phpstan-phpunit": "^1.0 || ^2.0",
3434
"spatie/laravel-ray": "^1.26"
3535
},
3636
"autoload": {

0 commit comments

Comments
 (0)