Skip to content

Commit bcee2d9

Browse files
authored
Merge pull request #20 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 02d5604 + 5cc96d8 commit bcee2d9

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.github/workflows/run-tests.yml

+9-4
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,35 @@ 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.1, 8.2, 8.3]
17-
laravel: [10.*, 11.*]
20+
laravel: ['10.*', '11.*', '12.*']
1821
stability: [prefer-lowest, prefer-stable]
1922
include:
2023
- laravel: 10.*
2124
testbench: 8.*
2225
carbon: ^2.63
2326
- laravel: 11.*
2427
testbench: 9.*
25-
carbon: '*'
28+
carbon: *
2629
exclude:
2730
- laravel: 11.*
2831
php: 8.1
32+
- laravel: 12.*
33+
php: 8.1
2934

3035
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
3136

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@
2020
"require": {
2121
"php": "^8.1|^8.2",
2222
"guzzlehttp/guzzle": "^7.7",
23-
"illuminate/contracts": "^10.0|^11.0",
23+
"illuminate/contracts": "^10.0|^11.0|^12.0",
2424
"spatie/laravel-package-tools": "^1.14.0"
2525
},
2626
"require-dev": {
2727
"laravel/pint": "^1.0",
2828
"nunomaduro/collision": "^7.0|^8.0",
2929
"nunomaduro/larastan": "^2.0.1",
30-
"orchestra/testbench": "^8.0|^9.0",
31-
"pestphp/pest": "^2.0",
32-
"pestphp/pest-plugin-arch": "^2.0",
30+
"orchestra/testbench": "^8.0|^9.0|^10.0",
31+
"pestphp/pest": "^2.0|^3.7",
32+
"pestphp/pest-plugin-arch": "^2.0|^3.0",
3333
"phpstan/extension-installer": "^1.1",
34-
"phpstan/phpstan-deprecation-rules": "^1.0",
35-
"phpstan/phpstan-phpunit": "^1.0"
34+
"phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
35+
"phpstan/phpstan-phpunit": "^1.0|^2.0"
3636
},
3737
"autoload": {
3838
"psr-4": {

0 commit comments

Comments
 (0)