Merge branch '4.x' into merge-4.x

Author: lindyhopchris

.github/workflows/tests.yml

@@ -2,9 +2,9 @@ name: Tests
 
 on:
   push:
-    branches: [ main, develop ]
+    branches: [ main, develop, 4.x ]
   pull_request:
-    branches: [ main, develop ]
+    branches: [ main, develop, 4.x ]
 
 jobs:
   build:

CHANGELOG.md

@@ -12,6 +12,12 @@ All notable changes to this project will be documented in this file. This projec
 - **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

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/support": "^11.0"

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;

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);

src/Core/Schema/Schema.php

@@ -223,7 +223,7 @@ public function uriType(): string
     /**
      * @inheritDoc
      */
-    public function url($extra = [], bool $secure = null): string
+    public function url($extra = [], ?bool $secure = null): string
     {
         $extra = Arr::wrap($extra);