Skip to content

Commit 604abcd

Browse files
authored
Merge pull request #37 from laravel-shift/l11-compatibility
Laravel 11.x Compatibility
2 parents d52f40d + e7dafa6 commit 604abcd

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

.github/workflows/run-tests.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,31 @@ 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]
16-
php: [8.1]
17-
laravel: [9.*]
19+
php: [8.1, '8.2']
20+
laravel: ['9.*', '11.*']
1821
stability: [prefer-lowest, prefer-stable]
1922
include:
2023
- laravel: 9.*
2124
testbench: 7.*
25+
- laravel: 11.*
26+
testbench: 9.*
27+
exclude:
28+
- laravel: 11.*
29+
php: 8.1
2230

2331
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2432

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,18 @@
1717
],
1818
"require": {
1919
"php": "^8.1",
20-
"illuminate/contracts": "^10.0",
21-
"illuminate/http": "^10.0",
20+
"illuminate/contracts": "^10.0|^11.0",
21+
"illuminate/http": "^10.0|^11.0",
2222
"open-telemetry/api": "^1.0",
2323
"open-telemetry/sdk": "^1.0",
2424
"php-http/guzzle7-adapter": "^1.0",
2525
"spatie/laravel-package-tools": "^1.13.8"
2626
},
2727
"require-dev": {
2828
"laravel/pint": "^1.3",
29-
"nunomaduro/collision": "^7.0",
29+
"nunomaduro/collision": "^7.0|^8.0",
3030
"nunomaduro/larastan": "^2.3.4",
31-
"orchestra/testbench": "^8.0",
31+
"orchestra/testbench": "^8.0|^9.0",
3232
"pestphp/pest": "^2.0",
3333
"pestphp/pest-plugin-laravel": "^2.0",
3434
"phpstan/extension-installer": "^1.2",

0 commit comments

Comments
 (0)