Skip to content

Commit 52e8582

Browse files
Merge pull request #156 from laravel-shift/l12-compatibility
Laravel 12.x Compatibility
2 parents 1ab9290 + 76667c9 commit 52e8582

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

.github/workflows/tests.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@ on:
44
push:
55
branches:
66
- main
7-
87
pull_request:
9-
types: [ opened, synchronize, reopened ]
8+
types:
9+
- opened
10+
- synchronize
11+
- reopened
1012

1113
jobs:
1214
test:
1315
runs-on: ubuntu-latest
16+
1417
strategy:
1518
fail-fast: false
1619
matrix:
17-
php: ['8.1', '8.2', '8.3' ]
18-
laravel: [ '8.*', '9.*', '10.*', '11.*' ]
19-
guzzle: [ '6.*', '7.*' ]
20-
dependency-version: [ prefer-lowest, prefer-stable ]
20+
php: ['8.1', '8.2', '8.3']
21+
laravel: ['8.*', '9.*', '10.*', '11.*', '12.*']
22+
guzzle: ['6.*', '7.*']
23+
dependency-version: [prefer-lowest, prefer-stable]
2124
include:
2225
- laravel: 8.*
2326
testbench: 6.*
@@ -27,7 +30,8 @@ jobs:
2730
testbench: 8.*
2831
- laravel: 11.*
2932
testbench: 9.*
30-
33+
- laravel: 12.*
34+
testbench: 10.*
3135
exclude:
3236
- laravel: 8.*
3337
php: 8.1
@@ -38,24 +42,22 @@ jobs:
3842
- laravel: 8.*
3943
php: 8.3
4044
dependency-version: prefer-lowest
41-
4245
- laravel: 9.*
4346
php: 8.2
4447
dependency-version: prefer-lowest
4548
- laravel: 9.*
4649
php: 8.3
4750
dependency-version: prefer-lowest
48-
4951
- laravel: 11.*
5052
php: 8.1
51-
52-
# Guzzle restrictions
5353
- laravel: 9.*
5454
guzzle: 6.*
5555
- laravel: 10.*
5656
guzzle: 6.*
5757
- laravel: 11.*
5858
guzzle: 6.*
59+
- laravel: 12.*
60+
php: '8.1'
5961

6062
name: P${{ matrix.php }} / L${{ matrix.laravel }} / G${{ matrix.guzzle }} / ${{ matrix.dependency-version }}
6163

composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
],
1212
"require": {
1313
"php": "^8.1",
14-
"illuminate/filesystem": "^8|^9|^10|^11",
15-
"illuminate/console": "^8|^9|^10|^11",
16-
"illuminate/support": "^8|^9|^10|^11",
14+
"illuminate/filesystem": "^8|^9|^10|^11|^12.0",
15+
"illuminate/console": "^8|^9|^10|^11|^12.0",
16+
"illuminate/support": "^8|^9|^10|^11|^12.0",
1717
"maennchen/zipstream-php": "^3.1",
1818
"guzzlehttp/guzzle": "^6.5.8|^7.2",
1919
"aws/aws-sdk-php": "^3.216.1"
2020
},
2121
"require-dev": {
22-
"orchestra/testbench": "^5|^6|^7|^8|^9",
22+
"orchestra/testbench": "^5|^6|^7|^8|^9|^10.0",
2323
"mockery/mockery": "^1.3.3",
2424
"phpunit/phpunit": ">=8.5.23|^9|^10"
2525
},

0 commit comments

Comments
 (0)