Skip to content

Commit 2781bf5

Browse files
committed
Merge branch 'develop' into next
2 parents f3ecaf6 + f673e0e commit 2781bf5

File tree

5 files changed

+17
-6
lines changed

5 files changed

+17
-6
lines changed

.github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ main, develop, next ]
5+
branches: [ main, develop, next, 4.x ]
66
pull_request:
7-
branches: [ main, develop, next ]
7+
branches: [ main, develop, next, 4.x ]
88

99
jobs:
1010
build:

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,25 @@ All notable changes to this project will be documented in this file. This projec
1818

1919
## Unreleased
2020

21+
## [5.0.1] - 2024-11-30
22+
23+
### Fixed
24+
25+
- Removed more PHP 8.4 deprecation notices.
26+
2127
## [5.0.0] - 2024-11-29
2228

2329
### Added
2430

2531
- **BREAKING**: [#21](https://github.com/laravel-json-api/core/pull/21) The `Authorizer` contract now allows all methods
2632
to return a `bool` or an Illuminate authorization response.
2733

34+
## [4.3.2] - 2024-11-30
35+
36+
### Fixed
37+
38+
- Remove more PHP 8.4 deprecation notices.
39+
2840
## [4.3.1] - 2024-11-29
2941

3042
### Fixed

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"require": {
2626
"php": "^8.2",
2727
"ext-json": "*",
28-
"illuminate/auth": "^11.33",
28+
"illuminate/auth": "^11.0",
2929
"illuminate/contracts": "^11.0",
3030
"illuminate/http": "^11.0",
3131
"illuminate/pipeline": "^11.0",

src/Core/Document/ErrorSource.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
class ErrorSource implements Serializable
2121
{
22-
2322
use Concerns\Serializable;
2423

2524
/**
@@ -71,7 +70,7 @@ public static function fromArray(array $source): self
7170
* @param string|null $pointer
7271
* @param string|null $parameter
7372
*/
74-
public function __construct(string $pointer = null, string $parameter = null)
73+
public function __construct(?string $pointer = null, ?string $parameter = null)
7574
{
7675
$this->pointer = $pointer;
7776
$this->parameter = $parameter;

src/Core/JsonApiService.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function route(): Route
6363
* @param string|null $name
6464
* @return Server
6565
*/
66-
public function server(string $name = null): Server
66+
public function server(?string $name = null): Server
6767
{
6868
if (is_string($name)) {
6969
return $this->servers()->server($name);

0 commit comments

Comments
 (0)