Skip to content

Commit 5798bb6

Browse files
authored
Merge pull request #12 from bilfeldt/features/laravel12
Add Laravel 12 support
2 parents a4d9c1a + 92ade2b commit 5798bb6

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.github/workflows/run-tests.yml

+9-5
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,23 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
os: [ubuntu-latest, windows-latest]
19-
php: [8.4, 8.3, 8.2, 8.1]
20-
laravel: ['10.*', '11.*']
19+
php: [8.1, 8.2, 8.3, 8.4]
20+
laravel: ['10.*', '11.*', '12.*']
2121
dependency-version: [prefer-stable]
2222
include:
2323
- laravel: 10.*
2424
testbench: 8.*
2525
- laravel: 11.*
2626
testbench: 9.*
27+
- laravel: 12.*
28+
testbench: 10.*
2729
exclude:
28-
- laravel: 11.*
29-
php: 8.1
3030
- laravel: 10.*
3131
php: 8.4
32+
- laravel: 11.*
33+
php: 8.1
34+
- laravel: 12.*
35+
php: 8.1
3236

3337
name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ${{ matrix.os }}
3438

@@ -50,7 +54,7 @@ jobs:
5054
5155
- name: Install dependencies
5256
run: |
53-
composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
57+
composer require "illuminate/contracts:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update
5458
composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction
5559
5660
- name: Execute tests

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes will be documented in this file
44

5+
## 1.4.0 - 2025-02-17
6+
7+
- Add Laravel 12 support
8+
59
## 1.3.0 - 2024-12-04
610

711
- Add PHP 8.4 support

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
Create request Correlation-IDs via middleware and pass both this globally unique `Correlation-ID` and any user provided `Request-ID` to the global log context.
1111

12-
| Version | Laravel | PHP |
13-
|---------|--------------|----------------------------------|
14-
| 1.* | 10.* \| 11.* | 8.1.* \| 8.2.* \| 8.3.* \| 8.4.* |
12+
| Version | Laravel | PHP |
13+
|---------|----------------------|----------------------------------|
14+
| 1.* | 10.* \| 11.* \| 12.* | 8.1.* \| 8.2.* \| 8.3.* \| 8.4.* |
1515

1616
## Motivation
1717

composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
],
2323
"require": {
2424
"php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
25-
"illuminate/contracts": "^10.0 || ^11.0"
25+
"illuminate/contracts": "^10.0 || ^11.0 || ^12.0"
2626
},
2727
"require-dev": {
2828
"nunomaduro/collision": "^7.8 || ^8.0",
29-
"orchestra/testbench": "^8.0 || ^9.0",
30-
"phpunit/phpunit": "^10.0"
29+
"orchestra/testbench": "^8.0 || ^9.0 || ^10.0",
30+
"phpunit/phpunit": "^10.0 || ^11.0"
3131
},
3232
"autoload": {
3333
"psr-4": {

0 commit comments

Comments
 (0)