Skip to content

Commit 8f8418a

Browse files
authored
Merge pull request #32 from bilfeldt/upgrades/laravel11
Add Laravel 11 support
2 parents 2fe2f6e + 9ae846e commit 8f8418a

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

.github/workflows/run-tests.yml

+11-3
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: false
1417
matrix:
1518
os: [ubuntu-latest, windows-latest]
1619
php: [8.3, 8.2, 8.1]
17-
laravel: [10.*]
20+
laravel: ['10.*', '11.*']
1821
dependency-version: [prefer-stable]
1922
include:
2023
- laravel: 10.*
2124
testbench: 8.*
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.dependency-version }} - ${{ matrix.os }}
2432

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ No breaking changes. The only changes are to the development dependencies used f
1717

1818
## Changes
1919

20+
### 3.2.0
21+
22+
- Add Laravel 11 compatibility
23+
2024
### 3.1.0
2125

2226
- Add PHP 8.3 compatibility

composer.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
],
2222
"require": {
2323
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
24-
"illuminate/contracts": "^10.0",
24+
"illuminate/contracts": "^10.0 || ^11.0",
2525
"ext-json": "*",
2626
"bilfeldt/laravel-correlation-id": "^1.0"
2727
},
2828
"require-dev": {
29-
"nunomaduro/collision": "^7.2",
30-
"orchestra/testbench": "^8.0",
29+
"nunomaduro/collision": "^7.2 || ^8.0",
30+
"orchestra/testbench": "^8.0 || ^9.0",
3131
"phpunit/phpunit": "^10.0",
3232
"spatie/laravel-ray": "^1.32"
3333
},
@@ -58,6 +58,6 @@
5858
}
5959
}
6060
},
61-
"minimum-stability": "stable",
61+
"minimum-stability": "dev",
6262
"prefer-stable": true
6363
}

0 commit comments

Comments
 (0)