Skip to content

Commit 836342b

Browse files
lindyhopchrislindyhopchris
committed
Merge branch 'release/5.0.3'
2 parents b2f4055 + 81dbb1d commit 836342b

File tree

17 files changed

+74
-69
lines changed

17 files changed

+74
-69
lines changed

‎.github/workflows/tests.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
php: [7.4, '8.0', 8.1, 8.2, 8.3]
17+
php: [7.4, '8.0', 8.1, 8.2, 8.3, 8.4]
1818

1919
steps:
2020
- name: Checkout Code
@@ -44,6 +44,3 @@ jobs:
4444

4545
- name: Execute mess detector
4646
run: composer run test-md
47-
48-
- name: Execute lint
49-
run: composer run test-cs-fixer

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file. This project adheres to
44
[Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
55

6+
## Unreleased
7+
8+
## [5.0.3] - 2024-11-29
9+
10+
### Fixed
11+
12+
- Removed deprecation messages in PHP 8.4.
13+
614
## [5.0.2] - 2023-05-29
715

816
### Fixed

‎src/Contracts/Factories/FactoryInterface.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ public function createRelationshipDataIsNull(): RelationshipDataInterface;
243243
*
244244
* @return MediaTypeInterface
245245
*/
246-
public function createMediaType(string $type, string $subType, array $parameters = null): MediaTypeInterface;
246+
public function createMediaType(string $type, string $subType, ?array $parameters = null): MediaTypeInterface;
247247

248248
/**
249249
* Create media type for Accept HTTP header.
@@ -260,7 +260,7 @@ public function createAcceptMediaType(
260260
int $position,
261261
string $type,
262262
string $subType,
263-
array $parameters = null,
263+
?array $parameters = null,
264264
float $quality = 1.0
265265
): AcceptMediaTypeInterface;
266266

‎src/Exceptions/JsonApiException.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class JsonApiException extends BaseJsonApiException
6363
* @SuppressWarnings(PHPMD.StaticAccess)
6464
* @SuppressWarnings(PHPMD.ElseExpression)
6565
*/
66-
public function __construct($errors, int $httpCode = self::DEFAULT_HTTP_CODE, Exception $previous = null)
66+
public function __construct($errors, int $httpCode = self::DEFAULT_HTTP_CODE, ?Exception $previous = null)
6767
{
6868
parent::__construct('JSON API error', 0, $previous);
6969

‎src/Factories/Factory.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public function createRelationshipDataIsNull(): RelationshipDataInterface
498498
/**
499499
* @inheritdoc
500500
*/
501-
public function createMediaType(string $type, string $subType, array $parameters = null): MediaTypeInterface
501+
public function createMediaType(string $type, string $subType, ?array $parameters = null): MediaTypeInterface
502502
{
503503
return new MediaType($type, $subType, $parameters);
504504
}
@@ -510,7 +510,7 @@ public function createAcceptMediaType(
510510
int $position,
511511
string $type,
512512
string $subType,
513-
array $parameters = null,
513+
?array $parameters = null,
514514
float $quality = 1.0
515515
): AcceptMediaTypeInterface {
516516
return new AcceptMediaType($position, $type, $subType, $parameters, $quality);

‎src/Http/Headers/AcceptMediaType.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function __construct(
4848
int $position,
4949
string $type,
5050
string $subType,
51-
array $parameters = null,
51+
?array $parameters = null,
5252
float $quality = 1.0
5353
) {
5454
parent::__construct($type, $subType, $parameters);

‎src/Http/Headers/MediaType.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class MediaType implements MediaTypeInterface
6060
* @param string $subType
6161
* @param array<string,string>|null $parameters
6262
*/
63-
public function __construct(string $type, string $subType, array $parameters = null)
63+
public function __construct(string $type, string $subType, ?array $parameters = null)
6464
{
6565
$type = \trim($type);
6666
if (empty($type) === true) {

‎src/Http/Query/BaseQueryParser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class BaseQueryParser implements BaseQueryParserInterface
5050
* @param array $parameters
5151
* @param string[]|null $messages
5252
*/
53-
public function __construct(array $parameters = [], array $messages = null)
53+
public function __construct(array $parameters = [], ?array $messages = null)
5454
{
5555
$this->setParameters($parameters)->setMessages($messages);
5656
}

‎src/Schema/Error.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@ class Error implements ErrorInterface
9797
*/
9898
public function __construct(
9999
$idx = null,
100-
LinkInterface $aboutLink = null,
100+
?LinkInterface $aboutLink = null,
101101
?iterable $typeLinks = null,
102-
string $status = null,
103-
string $code = null,
104-
string $title = null,
105-
string $detail = null,
106-
array $source = null,
102+
?string $status = null,
103+
?string $code = null,
104+
?string $title = null,
105+
?string $detail = null,
106+
?array $source = null,
107107
bool $hasMeta = false,
108108
$meta = null
109109
) {

‎src/Schema/ErrorCollection.php

+44-44
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ public function add(ErrorInterface $error): self
141141
*/
142142
public function addDataError(
143143
string $title,
144-
string $detail = null,
145-
string $status = null,
144+
?string $detail = null,
145+
?string $status = null,
146146
$idx = null,
147-
LinkInterface $aboutLink = null,
147+
?LinkInterface $aboutLink = null,
148148
?iterable $typeLinks = null,
149-
string $code = null,
149+
?string $code = null,
150150
bool $hasMeta = false,
151151
$meta = null
152152
): self {
@@ -181,12 +181,12 @@ public function addDataError(
181181
*/
182182
public function addDataTypeError(
183183
string $title,
184-
string $detail = null,
185-
string $status = null,
184+
?string $detail = null,
185+
?string $status = null,
186186
$idx = null,
187-
LinkInterface $aboutLink = null,
187+
?LinkInterface $aboutLink = null,
188188
?iterable $typeLinks = null,
189-
string $code = null,
189+
?string $code = null,
190190
bool $hasMeta = false,
191191
$meta = null
192192
): self {
@@ -221,12 +221,12 @@ public function addDataTypeError(
221221
*/
222222
public function addDataIdError(
223223
string $title,
224-
string $detail = null,
225-
string $status = null,
224+
?string $detail = null,
225+
?string $status = null,
226226
$idx = null,
227-
LinkInterface $aboutLink = null,
227+
?LinkInterface $aboutLink = null,
228228
?iterable $typeLinks = null,
229-
string $code = null,
229+
?string $code = null,
230230
bool $hasMeta = false,
231231
$meta = null
232232
): self {
@@ -261,12 +261,12 @@ public function addDataIdError(
261261
*/
262262
public function addAttributesError(
263263
string $title,
264-
string $detail = null,
265-
string $status = null,
264+
?string $detail = null,
265+
?string $status = null,
266266
$idx = null,
267-
LinkInterface $aboutLink = null,
267+
?LinkInterface $aboutLink = null,
268268
?iterable $typeLinks = null,
269-
string $code = null,
269+
?string $code = null,
270270
bool $hasMeta = false,
271271
$meta = null
272272
): self {
@@ -305,12 +305,12 @@ public function addAttributesError(
305305
public function addDataAttributeError(
306306
$name,
307307
string $title,
308-
string $detail = null,
309-
string $status = null,
308+
?string $detail = null,
309+
?string $status = null,
310310
$idx = null,
311-
LinkInterface $aboutLink = null,
311+
?LinkInterface $aboutLink = null,
312312
?iterable $typeLinks = null,
313-
string $code = null,
313+
?string $code = null,
314314
bool $hasMeta = false,
315315
$meta = null
316316
): self {
@@ -345,12 +345,12 @@ public function addDataAttributeError(
345345
*/
346346
public function addRelationshipsError(
347347
string $title,
348-
string $detail = null,
349-
string $status = null,
348+
?string $detail = null,
349+
?string $status = null,
350350
$idx = null,
351-
LinkInterface $aboutLink = null,
351+
?LinkInterface $aboutLink = null,
352352
?iterable $typeLinks = null,
353-
string $code = null,
353+
?string $code = null,
354354
bool $hasMeta = false,
355355
$meta = null
356356
): self {
@@ -389,12 +389,12 @@ public function addRelationshipsError(
389389
public function addRelationshipError(
390390
$name,
391391
string $title,
392-
string $detail = null,
393-
string $status = null,
392+
?string $detail = null,
393+
?string $status = null,
394394
$idx = null,
395-
LinkInterface $aboutLink = null,
395+
?LinkInterface $aboutLink = null,
396396
?iterable $typeLinks = null,
397-
string $code = null,
397+
?string $code = null,
398398
bool $hasMeta = false,
399399
$meta = null
400400
): self {
@@ -433,12 +433,12 @@ public function addRelationshipError(
433433
public function addRelationshipTypeError(
434434
$name,
435435
string $title,
436-
string $detail = null,
437-
string $status = null,
436+
?string $detail = null,
437+
?string $status = null,
438438
$idx = null,
439-
LinkInterface $aboutLink = null,
439+
?LinkInterface $aboutLink = null,
440440
?iterable $typeLinks = null,
441-
string $code = null,
441+
?string $code = null,
442442
bool $hasMeta = false,
443443
$meta = null
444444
): self {
@@ -477,12 +477,12 @@ public function addRelationshipTypeError(
477477
public function addRelationshipIdError(
478478
$name,
479479
string $title,
480-
string $detail = null,
481-
string $status = null,
480+
?string $detail = null,
481+
?string $status = null,
482482
$idx = null,
483-
LinkInterface $aboutLink = null,
483+
?LinkInterface $aboutLink = null,
484484
?iterable $typeLinks = null,
485-
string $code = null,
485+
?string $code = null,
486486
bool $hasMeta = false,
487487
$meta = null
488488
): self {
@@ -521,12 +521,12 @@ public function addRelationshipIdError(
521521
public function addQueryParameterError(
522522
string $name,
523523
string $title,
524-
string $detail = null,
525-
string $status = null,
524+
?string $detail = null,
525+
?string $status = null,
526526
$idx = null,
527-
LinkInterface $aboutLink = null,
527+
?LinkInterface $aboutLink = null,
528528
?iterable $typeLinks = null,
529-
string $code = null,
529+
?string $code = null,
530530
bool $hasMeta = false,
531531
$meta = null
532532
): self {
@@ -557,12 +557,12 @@ public function addQueryParameterError(
557557
protected function addResourceError(
558558
string $title,
559559
string $pointer,
560-
string $detail = null,
561-
string $status = null,
560+
?string $detail = null,
561+
?string $status = null,
562562
$idx = null,
563-
LinkInterface $aboutLink = null,
563+
?LinkInterface $aboutLink = null,
564564
?iterable $typeLinks = null,
565-
string $code = null,
565+
?string $code = null,
566566
bool $hasMeta = false,
567567
$meta = null
568568
): self {

‎tests/Data/Models/Author.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Author extends stdClass
4040
*
4141
* @return Author
4242
*/
43-
public static function instance(int $identity, string $firstName, string $lastName, array $comments = null)
43+
public static function instance(int $identity, string $firstName, string $lastName, ?array $comments = null)
4444
{
4545
$author = new self();
4646

‎tests/Data/Models/AuthorCModel.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class AuthorCModel implements ArrayAccess, IteratorAggregate
4545
* @param string $lastName
4646
* @param array|null $comments
4747
*/
48-
public function __construct(int $identity, string $firstName, string $lastName, array $comments = null)
48+
public function __construct(int $identity, string $firstName, string $lastName, ?array $comments = null)
4949
{
5050
$this[self::ATTRIBUTE_ID] = $identity;
5151
$this[self::ATTRIBUTE_FIRST_NAME] = $firstName;

‎tests/Data/Models/Comment.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Comment extends stdClass
3636
*
3737
* @return Comment
3838
*/
39-
public static function instance(int $identity, string $body, Author $author = null)
39+
public static function instance(int $identity, string $body, ?Author $author = null)
4040
{
4141
$comment = new self();
4242

‎tests/Data/Models/Post.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public static function instance(
4444
int $identity,
4545
string $title,
4646
string $body,
47-
Author $author = null,
47+
?Author $author = null,
4848
iterable $comments = []
4949
) {
5050
$post = new self();

‎tests/Data/Models/Site.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class Site extends stdClass
3636
*
3737
* @return Site
3838
*/
39-
public static function instance(int $identity, string $name, array $posts = null)
39+
public static function instance(int $identity, string $name, ?array $posts = null)
4040
{
4141
$site = new self();
4242

‎tests/Extensions/Issue91/Category.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class Category
3939
* @param string $description
4040
* @param Category|null $parent
4141
*/
42-
public function __construct(int $index, string $description, Category $parent = null)
42+
public function __construct(int $index, string $description, ?Category $parent = null)
4343
{
4444
$this->index = $index;
4545
$this->description = $description;

‎tests/Http/ResponsesTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ public function testErrorResponse4(): void
283283
*
284284
* @return void
285285
*/
286-
private function willBeCalledGetMediaType(string $type, string $subType, array $parameters = null): void
286+
private function willBeCalledGetMediaType(string $type, string $subType, ?array $parameters = null): void
287287
{
288288
$mediaType = new MediaType($type, $subType, $parameters);
289289

0 commit comments

Comments
 (0)