Merge branch 'develop' into next

lindyhopchris · lindyhopchris · commit 1b5a189a6c4c · 2024-11-30T17:22:26.000Z
diff --git a/.github/workflows/tests.yml b/.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:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [3.1.0] - 2024-11-30
+
+### Added
+
+- Allow `laravel-json-api/core` v4 and v5.
+
+### Fixed
+
+- Remove deprecation notices for PHP 8.4.
+
 ## [3.0.0] - 2024-03-12
 
 ### Changed
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "ext-json": "*",
         "illuminate/contracts": "^11.0",
         "illuminate/pipeline": "^11.0",
-        "laravel-json-api/core": "^5.0",
+        "laravel-json-api/core": "^6.0",
         "laravel-json-api/validation": "^5.0"
     },
     "require-dev": {
diff --git a/phpunit.xml b/phpunit.xml
@@ -13,6 +13,7 @@
          failOnWarning="true"
          failOnDeprecation="true"
          failOnNotice="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
 >
     <coverage/>
     <testsuites>
diff --git a/src/Pipes/ValidationExceptionHandler.php b/src/Pipes/ValidationExceptionHandler.php
@@ -36,7 +36,7 @@ class ValidationExceptionHandler
      */
     public function __construct(
         private readonly Factory $factory,
-        Translator $translator = null,
+        ?Translator $translator = null,
     ) {
         $this->translator = $translator;
     }
diff --git a/tests/Integration/ExceptionsTest.php b/tests/Integration/ExceptionsTest.php
@@ -364,7 +364,7 @@ public function testRequestException(): void
         $expected = [
             'errors' => [
                 [
-                    'detail' => 'Your request is badly formatted.',
+                    'detail' => 'Bad request.',
                     'status' => '400',
                     'title' => 'Bad Request',
                 ],
@@ -387,6 +387,7 @@ public function testRequestExceptionWithoutMessage(): void
         $expected = [
             'errors' => [
                 [
+                    'detail' => 'Bad request.',
                     'status' => '400',
                     'title' => 'Bad Request',
                 ],

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`failOnWarning="true"`
`14`	`14`	`failOnDeprecation="true"`
`15`	`15`	`failOnNotice="true"`
	`16`	`+ displayDetailsOnTestsThatTriggerDeprecations="true"`
`16`	`17`	`>`
`17`	`18`	`<coverage/>`
`18`	`19`	`<testsuites>`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class ValidationExceptionHandler`
`36`	`36`	`*/`
`37`	`37`	`public function __construct(`
`38`	`38`	`private readonly Factory $factory,`
`39`		`- Translator $translator = null,`
	`39`	`+ ?Translator $translator = null,`
`40`	`40`	`) {`
`41`	`41`	`$this->translator = $translator;`
`42`	`42`	`}`