Merge branch 'develop' into next

laravel-json-api · Nov 30, 2024 · 2781bf5 · 2781bf5
2 parents f3ecaf6 + f673e0e
commit 2781bf5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop, next ]
+    branches: [ main, develop, next, 4.x ]
   pull_request:
-    branches: [ main, develop, next ]
+    branches: [ main, develop, next, 4.x ]
 
 jobs:
   build:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,13 +18,25 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [5.0.1] - 2024-11-30
+
+### Fixed
+
+- Removed more PHP 8.4 deprecation notices.
+
 ## [5.0.0] - 2024-11-29
 
 ### Added
 
 - **BREAKING**: [#21](https://github.com/laravel-json-api/core/pull/21) The `Authorizer` contract now allows all methods
   to return a `bool` or an Illuminate authorization response.
 
+## [4.3.2] - 2024-11-30
+
+### Fixed
+
+- Remove more PHP 8.4 deprecation notices.
+
 ## [4.3.1] - 2024-11-29
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
     "require": {
         "php": "^8.2",
         "ext-json": "*",
-        "illuminate/auth": "^11.33",
+        "illuminate/auth": "^11.0",
         "illuminate/contracts": "^11.0",
         "illuminate/http": "^11.0",
         "illuminate/pipeline": "^11.0",

diff --git a/src/Core/Document/ErrorSource.php b/src/Core/Document/ErrorSource.php
@@ -19,7 +19,6 @@
 
 class ErrorSource implements Serializable
 {
-
     use Concerns\Serializable;
 
     /**
@@ -71,7 +70,7 @@ public static function fromArray(array $source): self
      * @param string|null $pointer
      * @param string|null $parameter
      */
-    public function __construct(string $pointer = null, string $parameter = null)
+    public function __construct(?string $pointer = null, ?string $parameter = null)
     {
         $this->pointer = $pointer;
         $this->parameter = $parameter;

diff --git a/src/Core/JsonApiService.php b/src/Core/JsonApiService.php
@@ -63,7 +63,7 @@ public function route(): Route
      * @param string|null $name
      * @return Server
      */
-    public function server(string $name = null): Server
+    public function server(?string $name = null): Server
     {
         if (is_string($name)) {
             return $this->servers()->server($name);