Merge branch 'develop' into next

Author: lindyhopchris

.github/workflows/tests.yml

@@ -14,8 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
-        laravel: [11]
+        php: [8.2, 8.3, 8.4]
 
     steps:
     - name: Checkout Code
@@ -30,9 +29,6 @@ jobs:
         coverage: none
         ini-values: error_reporting=E_ALL
 
-    - name: Set Laravel Version
-      run: composer require "illuminate/contracts:^${{ matrix.laravel }}" --no-update
-
     - name: Install dependencies
       uses: nick-fields/retry@v3
       with:

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [4.2.0] - 2024-11-30
+
+### Added
+
+- Package now requires `laravel-json-api/core` v4 or v5.
+
+### Fixed
+
+- Remove deprecation notices in PHP 8.4.
+
 ## [4.1.1] - 2024-06-20
 
 ### Fixed

composer.json

@@ -28,7 +28,7 @@
         "illuminate/contracts": "^11.0",
         "illuminate/http": "^11.0",
         "illuminate/support": "^11.0",
-        "laravel-json-api/core": "^5.0"
+        "laravel-json-api/core": "^6.0"
     },
     "require-dev": {
         "orchestra/testbench": "^9.0",

phpunit.xml

@@ -13,6 +13,7 @@
          failOnWarning="true"
          failOnDeprecation="true"
          failOnNotice="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <coverage/>
     <testsuites>

src/JsonApiValidation.php

@@ -66,7 +66,7 @@ public static function showValidatorFailures(): self
      * @param string|null $path
      * @return string
      */
-    public static function translationKeyForRule($rule, string $path = null): string
+    public static function translationKeyForRule($rule, ?string $path = null): string
     {
         $name = Str::snake(class_basename($rule));
 
@@ -80,7 +80,7 @@ public static function translationKeyForRule($rule, string $path = null): string
      * @param string|null $path
      * @return string
      */
-    public static function qualifyTranslationKey(string $key, string $path = null): string
+    public static function qualifyTranslationKey(string $key, ?string $path = null): string
     {
         $namespace = self::$translationNamespace;
         $qualified = "{$namespace}::validation.{$key}";

src/Rule.php

@@ -132,7 +132,7 @@ public static function dateTime(): DateTimeIso8601
      * @param array|null $allowed
      * @return AllowedFieldSets
      */
-    public static function fieldSets(array $allowed = null): AllowedFieldSets
+    public static function fieldSets(?array $allowed = null): AllowedFieldSets
     {
         if (is_null($allowed)) {
             return AllowedFieldSets::make(
@@ -233,7 +233,7 @@ public static function integer(): JsonNumber
      * @param string|null $name
      * @return ParameterNotSupported
      */
-    public static function notSupported(string $name = null): ParameterNotSupported
+    public static function notSupported(?string $name = null): ParameterNotSupported
     {
         return new ParameterNotSupported($name);
     }

src/Rules/AllowedFieldSets.php

@@ -68,7 +68,7 @@ public function __construct(iterable $allowed = [])
      *      the allowed fields, empty array for none allowed, or null for all allowed.
      * @return $this
      */
-    public function allow(string $resourceType, array $fields = null): self
+    public function allow(string $resourceType, ?array $fields = null): self
     {
         $this->allowed[$resourceType] = $fields;
 

src/Translator.php

@@ -46,7 +46,7 @@ public function __construct(TranslatorContract $translator)
      *      rule failure details
      * @return Error
      */
-    public function invalid(string $pointer, string $detail = null, array $failed = []): Error
+    public function invalid(string $pointer, ?string $detail = null, array $failed = []): Error
     {
         return Error::make()
             ->setStatus(422)
@@ -67,7 +67,7 @@ public function invalid(string $pointer, string $detail = null, array $failed =
      *      rule failure details
      * @return Error
      */
-    public function invalidResource(string $pointer, string $detail = null, array $failed = []): Error
+    public function invalidResource(string $pointer, ?string $detail = null, array $failed = []): Error
     {
         return Error::make()
             ->setStatus(422)
@@ -88,7 +88,7 @@ public function invalidResource(string $pointer, string $detail = null, array $f
      *      rule failure details.
      * @return Error
      */
-    public function invalidQueryParameter(string $param, string $detail = null, array $failed = []): Error
+    public function invalidQueryParameter(string $param, ?string $detail = null, array $failed = []): Error
     {
         return Error::make()
             ->setStatus(400)
@@ -106,7 +106,7 @@ public function invalidQueryParameter(string $param, string $detail = null, arra
      *      the validation message (already translated).
      * @return Error
      */
-    public function invalidDeleteRequest(string $detail = null): Error
+    public function invalidDeleteRequest(?string $detail = null): Error
     {
         return Error::make()
             ->setStatus(422)