Merge branch 'release/6.0.1'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
         laravel: [10, 11]
         phpunit: [10.5, 11]
 

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [6.0.1] - 2024-11-30
+
+### Fixed
+
+- Remove deprecation notices from PHP 8.4.
+
 ## [6.0.0] - 2024-03-12
 
 ### Changed

README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/cloudcreativity/json-api-testing.svg?branch=master)](https://travis-ci.org/cloudcreativity/json-api)
-
 # cloudcreativity/json-api-testing
 
 PHPUnit test helpers for checking JSON API documents.

phpunit.xml

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

src/Constraints/HttpStatusIsSuccessful.php

@@ -32,7 +32,7 @@ class HttpStatusIsSuccessful extends Constraint
      *
      * @param string|null $content
      */
-    public function __construct(string $content = null)
+    public function __construct(?string $content = null)
     {
         $this->content = $content;
     }

src/Constraints/OnlyExactInList.php

@@ -26,7 +26,7 @@ class OnlyExactInList extends OnlySubsetsInList
     /**
      * @inheritdoc
      */
-    protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): never
+    protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         $comparisonFailure = Compare::failure(
             $this->expected,

src/Constraints/OnlyIdentifiersInList.php

@@ -26,7 +26,7 @@ class OnlyIdentifiersInList extends OnlySubsetsInList
     /**
      * @inheritdoc
      */
-    protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): never
+    protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         $comparisonFailure = Compare::failure(
             $this->expected,

src/Constraints/OnlySubsetsInList.php

@@ -92,7 +92,7 @@ public function toString(): string
     /**
      * @inheritdoc
      */
-    protected function fail($other, $description, ComparisonFailure $comparisonFailure = null): never
+    protected function fail($other, $description, ?ComparisonFailure $comparisonFailure = null): never
     {
         if (!$comparisonFailure) {
             $comparisonFailure = Compare::failure(

src/HttpAssert.php

@@ -50,7 +50,7 @@ class HttpAssert
     public static function assertStatusCode(
         $status,
         int $expected,
-        string $content = null,
+        ?string $content = null,
         string $message = ''
     ): void
     {
@@ -562,7 +562,7 @@ public static function assertAcceptedWithId(
      * @param string $message
      * @return void
      */
-    public static function assertNoContent($status, string $content = null, string $message = ''): void
+    public static function assertNoContent($status, ?string $content = null, string $message = ''): void
     {
         self::assertStatusCode($status, self::STATUS_NO_CONTENT, $content, $message);
         PHPUnitAssert::assertEmpty($content, $message ?: 'Expecting HTTP body content to be empty.');

src/HttpMessage.php

@@ -52,8 +52,8 @@ class HttpMessage implements ArrayAccess
      */
     public function __construct(
         int $status,
-        string $contentType = null,
-        string $content = null,
+        ?string $contentType = null,
+        ?string $content = null,
         array $headers = []
     ) {
         $this->status = $status;