Skip to content

Commit b0ab711

Browse files
committed
Merge branch 'develop' into next
2 parents 46291c8 + a22dc37 commit b0ab711

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.github/workflows/tests.yml

+1-5
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [8.2, 8.3]
18-
laravel: [11]
17+
php: [8.2, 8.3, 8.4]
1918

2019
steps:
2120
- name: Checkout Code
@@ -30,9 +29,6 @@ jobs:
3029
coverage: none
3130
ini-values: error_reporting=E_ALL
3231

33-
- name: Set Laravel Version
34-
run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
35-
3632
- name: Install dependencies
3733
uses: nick-fields/retry@v3
3834
with:

CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
55

66
## Unreleased
77

8+
## [4.1.0] - 2024-11-30
9+
10+
### Added
11+
12+
- Allow `laravel-json-api/core` v4 or v5.
13+
14+
### Fixed
15+
16+
- Remove deprecation notices in PHP 8.4.
17+
818
## [4.0.0] - 2024-03-14
919

1020
### Changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"ext-json": "*",
2828
"illuminate/contracts": "^11.0",
2929
"illuminate/support": "^11.0",
30-
"laravel-json-api/core": "^5.0",
31-
"laravel-json-api/neomerx-json-api": "^5.0.2"
30+
"laravel-json-api/core": "^6.0",
31+
"laravel-json-api/neomerx-json-api": "^5.0.3"
3232
},
3333
"require-dev": {
3434
"phpunit/phpunit": "^10.5"

phpunit.xml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
failOnWarning="true"
1414
failOnDeprecation="true"
1515
failOnNotice="true"
16+
displayDetailsOnTestsThatTriggerDeprecations="true"
1617
>
1718
<coverage/>
1819
<testsuites>

0 commit comments

Comments
 (0)