Skip to content

Commit 1969ba6

Browse files
committedNov 30, 2024·
Merge branch 'release/3.1.0'
2 parents 72b308c + d3f8f49 commit 1969ba6

File tree

6 files changed

+21
-9
lines changed

6 files changed

+21
-9
lines changed
 

‎.github/workflows/tests.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ 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]
18+
core: ['4.3.2', '5.0.1']
1919

2020
steps:
2121
- name: Checkout Code
@@ -30,8 +30,8 @@ jobs:
3030
coverage: none
3131
ini-values: error_reporting=E_ALL
3232

33-
- name: Set Laravel Version
34-
run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
33+
- name: Set Laravel JSON:API Core Version
34+
run: composer require "laravel-json-api/core:^${{ matrix.core }}" --no-update
3535

3636
- name: Install dependencies
3737
uses: nick-fields/retry@v3

‎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+
## [3.1.0] - 2024-11-30
9+
10+
### Added
11+
12+
- Allow `laravel-json-api/core` v4 and v5.
13+
14+
### Fixed
15+
16+
- Remove deprecation notices for PHP 8.4.
17+
818
## [3.0.0] - 2024-03-12
919

1020
### Changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"ext-json": "*",
2828
"illuminate/contracts": "^11.0",
2929
"illuminate/pipeline": "^11.0",
30-
"laravel-json-api/core": "^4.0",
31-
"laravel-json-api/validation": "^4.0"
30+
"laravel-json-api/core": "^4.3.2|^5.0.1",
31+
"laravel-json-api/validation": "^4.2"
3232
},
3333
"require-dev": {
3434
"laravel-json-api/testing": "^3.0",
@@ -50,7 +50,7 @@
5050
"dev-develop": "3.x-dev"
5151
}
5252
},
53-
"minimum-stability": "dev",
53+
"minimum-stability": "stable",
5454
"prefer-stable": true,
5555
"config": {
5656
"sort-packages": true

‎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>

‎src/Pipes/ValidationExceptionHandler.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class ValidationExceptionHandler
3636
*/
3737
public function __construct(
3838
private readonly Factory $factory,
39-
Translator $translator = null,
39+
?Translator $translator = null,
4040
) {
4141
$this->translator = $translator;
4242
}

‎tests/Integration/ExceptionsTest.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ public function testRequestException(): void
364364
$expected = [
365365
'errors' => [
366366
[
367-
'detail' => 'Your request is badly formatted.',
367+
'detail' => 'Bad request.',
368368
'status' => '400',
369369
'title' => 'Bad Request',
370370
],
@@ -387,6 +387,7 @@ public function testRequestExceptionWithoutMessage(): void
387387
$expected = [
388388
'errors' => [
389389
[
390+
'detail' => 'Bad request.',
390391
'status' => '400',
391392
'title' => 'Bad Request',
392393
],

0 commit comments

Comments
 (0)