Merge branch 'release/6.2.0'

lindyhopchris · lindyhopchris · commit bb2ff0a87013 · 2025-04-09T20:15:46.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,17 @@ jobs:
       matrix:
         php: [8.2, 8.3, 8.4]
         laravel: [10, 11, 12]
-        phpunit: [10.5, 11]
+        phpunit: [10.5, 11, 12]
+        exclude:
+          - php: 8.2
+            laravel: 12
+            phpunit: 12
+          - php: 8.2
+            laravel: 11
+            phpunit: 12
+          - php: 8.2
+            laravel: 10
+            phpunit: 12
 
     steps:
       - name: Checkout Code
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec
 
 ## Unreleased
 
+## [6.2.0] - 2025-04-09
+
+### Added
+
+- Package now supports PHPUnit 12.
+
 ## [6.1.0] - 2025-02-24
 
 ### Added
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "ext-json": "*",
         "illuminate/contracts": "^10.0|^11.0|^12.0",
         "illuminate/support": "^10.0|^11.0|^12.0",
-        "phpunit/phpunit": "^10.5|^11.0"
+        "phpunit/phpunit": "^10.5|^11.0|^12.0"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Assert.php b/src/Assert.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Compare.php b/src/Compare.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Concerns/HasDocumentAssertions.php b/src/Concerns/HasDocumentAssertions.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Concerns/HasHttpAssertions.php b/src/Concerns/HasHttpAssertions.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/EmptyOrMissingList.php b/src/Constraints/EmptyOrMissingList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/ExactInDocument.php b/src/Constraints/ExactInDocument.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/ExactInList.php b/src/Constraints/ExactInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/HttpStatusIs.php b/src/Constraints/HttpStatusIs.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/HttpStatusIsSuccessful.php b/src/Constraints/HttpStatusIsSuccessful.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/IdentifierInDocument.php b/src/Constraints/IdentifierInDocument.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/IdentifierInList.php b/src/Constraints/IdentifierInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/IdentifiersInOrder.php b/src/Constraints/IdentifiersInOrder.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/OnlyExactInList.php b/src/Constraints/OnlyExactInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/OnlyIdentifiersInList.php b/src/Constraints/OnlyIdentifiersInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/OnlySubsetsInList.php b/src/Constraints/OnlySubsetsInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/SubsetInDocument.php b/src/Constraints/SubsetInDocument.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/SubsetInList.php b/src/Constraints/SubsetInList.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Constraints/SubsetsInOrder.php b/src/Constraints/SubsetsInOrder.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Document.php b/src/Document.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/HttpAssert.php b/src/HttpAssert.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/HttpMessage.php b/src/HttpMessage.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Utils/JsonObject.php b/src/Utils/JsonObject.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Utils/JsonStack.php b/src/Utils/JsonStack.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/src/Utils/JsonToArray.php b/src/Utils/JsonToArray.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/tests/Assertions/CreatedTest.php b/tests/Assertions/CreatedTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/tests/Assertions/ErrorsTest.php b/tests/Assertions/ErrorsTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
diff --git a/tests/Assertions/FetchedManyTest.php b/tests/Assertions/FetchedManyTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
@@ -17,6 +17,7 @@
 use CloudCreativity\JsonApi\Testing\Tests\TestCase;
 use CloudCreativity\JsonApi\Testing\Tests\TestModel;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class FetchedManyTest extends TestCase
 {
@@ -363,8 +364,8 @@ function ($post1, $post2, $post3) {
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedManyArrayProvider
      */
+    #[DataProvider('fetchedManyArrayProvider')]
     public function testFetchedManyWithArray(bool $expected, Closure $provider): void
     {
         $value = $provider($this->post1, $this->post2, $this->post3);
@@ -383,8 +384,8 @@ public function testFetchedManyWithArray(bool $expected, Closure $provider): voi
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedManyArrayProvider
      */
+     #[DataProvider('fetchedManyArrayProvider')]
     public function testFetchedManyWithObject(bool $expected, Closure $provider): void
     {
         $value = $provider($this->post1, $this->post2, $this->post3);
@@ -677,8 +678,8 @@ function ($post1, $post2, $post3) {
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedManyInOrderArrayProvider
      */
+     #[DataProvider('fetchedManyInOrderArrayProvider')]
     public function testFetchedManyInOrderWithArray(bool $expected, Closure $provider): void
     {
         $value = $provider($this->post1, $this->post2, $this->post3);
@@ -697,8 +698,8 @@ public function testFetchedManyInOrderWithArray(bool $expected, Closure $provide
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedManyInOrderArrayProvider
      */
+     #[DataProvider('fetchedManyInOrderArrayProvider')]
     public function testFetchedManyInOrderWithObject(bool $expected, Closure $provider): void
     {
         $value = $provider($this->post1, $this->post2, $this->post3);
@@ -879,8 +880,8 @@ function ($post1, $post2, $post3) {
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedManyExactArrayProvider
      */
+     #[DataProvider('fetchedManyExactArrayProvider')]
     public function testFetchedManyExactWithArray(bool $expected, Closure $provider): void
     {
         $value = $provider($this->post1, $this->post2, $this->post3);
diff --git a/tests/Assertions/FetchedOneTest.php b/tests/Assertions/FetchedOneTest.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2024 Cloud Creativity Limited
+ * Copyright 2025 Cloud Creativity Limited
  *
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
@@ -18,6 +18,7 @@
 use CloudCreativity\JsonApi\Testing\Tests\TestModel;
 use CloudCreativity\JsonApi\Testing\Tests\TestObject;
 use Illuminate\Support\Collection;
+use PHPUnit\Framework\Attributes\DataProvider;
 
 class FetchedOneTest extends TestCase
 {
@@ -244,8 +245,8 @@ function (array $resource) {
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedOneArrayProvider
      */
+     #[DataProvider('fetchedOneArrayProvider')]
     public function testFetchedOneWithArray(bool $expected, Closure $provider): void
     {
         $value = $provider($this->resource);
@@ -264,8 +265,8 @@ public function testFetchedOneWithArray(bool $expected, Closure $provider): void
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedOneArrayProvider
      */
+     #[DataProvider('fetchedOneArrayProvider')]
     public function testFetchedOneWithObject(bool $expected, Closure $provider): void
     {
         $value = $provider($this->resource);
@@ -426,8 +427,8 @@ function (array $resource) {
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedOneExactArrayProvider
      */
+     #[DataProvider('fetchedOneExactArrayProvider')]
     public function testFetchedOneExactWithArray(bool $expected, Closure $provider): void
     {
         $value = $provider($this->resource);
@@ -446,8 +447,8 @@ public function testFetchedOneExactWithArray(bool $expected, Closure $provider):
      * @param bool $expected
      * @param Closure $provider
      * @return void
-     * @dataProvider fetchedOneExactArrayProvider
      */
+     #[DataProvider('fetchedOneExactArrayProvider')]
     public function testFetchedOneExactWithObject(bool $expected, Closure $provider): void
     {
         $value = $provider($this->resource);
diff --git a/tests/Assertions/FetchedToManyTest.php b/tests/Assertions/FetchedToManyTest.php
diff --git a/tests/Assertions/FetchedToOneTest.php b/tests/Assertions/FetchedToOneTest.php
diff --git a/tests/Assertions/IncludedTest.php b/tests/Assertions/IncludedTest.php
diff --git a/tests/Assertions/LinksTest.php b/tests/Assertions/LinksTest.php
diff --git a/tests/Assertions/MetaTest.php b/tests/Assertions/MetaTest.php
diff --git a/tests/Assertions/StatusCodeTest.php b/tests/Assertions/StatusCodeTest.php
diff --git a/tests/TestCase.php b/tests/TestCase.php
diff --git a/tests/TestModel.php b/tests/TestModel.php
diff --git a/tests/TestObject.php b/tests/TestObject.php
diff --git a/tests/Utils/JsonStackTest.php b/tests/Utils/JsonStackTest.php

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`<?php`
`2`	`2`	`/*`
`3`		`- * Copyright 2024 Cloud Creativity Limited`
	`3`	`+ * Copyright 2025 Cloud Creativity Limited`
`4`	`4`	`*`
`5`	`5`	`* Use of this source code is governed by an MIT-style`
`6`	`6`	`* license that can be found in the LICENSE file or at`