Merge branch 'release/2.1.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: true
       matrix:
         php: [8.1, 8.2]
-        laravel: [10]
+        testing: [4.1, 5]
 
     steps:
     - name: Checkout Code
@@ -30,8 +30,8 @@ jobs:
         coverage: none
         ini-values: error_reporting=E_ALL
 
-    - name: Set Laravel Version
-      run: composer require "illuminate/testing:^${{ matrix.laravel }}" --no-update
+    - name: Set Testing Version
+      run: composer require "cloudcreativity/json-api-testing:^${{ matrix.testing }}" --no-update
 
     - name: Install dependencies
       uses: nick-fields/retry@v2

.gitignore

@@ -1,3 +1,4 @@
 vendor/
 composer.lock
 .phpunit.result.cache
+.phpunit.cache

CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [2.1.0] - 2023-02-18
+
+### Added
+
+- Add support for PHPUnit 10.
+
 ## [2.0.0] - 2023-02-14
 
 ### Changed

composer.json

@@ -25,14 +25,14 @@
     "require": {
         "php": "^8.1",
         "ext-json": "*",
-        "cloudcreativity/json-api-testing": "^4.1",
+        "cloudcreativity/json-api-testing": "^4.1|^5.0",
         "illuminate/http": "^10.0",
         "illuminate/support": "^10.0",
         "illuminate/testing": "^10.0"
     },
     "require-dev": {
         "laravel/framework": "^10.0",
-        "phpunit/phpunit": "^9.5.28"
+        "phpunit/phpunit": "^9.5.28|^10.0.7"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,20 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         convertDeprecationsToExceptions="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false"
+         beStrictAboutTestsThatDoNotTestAnything="false" bootstrap="vendor/autoload.php" colors="true"
+         processIsolation="false" stopOnError="false" stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache"
+         backupStaticProperties="false">
     <coverage>
         <include>
             <directory suffix=".php">src/</directory>

tests/Unit/TestBuilderTest.php

@@ -568,7 +568,7 @@ public function testFilter(): void
     /**
      * @return array
      */
-    public function idProvider(): array
+    public static function idProvider(): array
     {
         return [
             'int' => [static fn() => 1],
@@ -658,7 +658,7 @@ public function testFilterIdInQuery(\Closure $scenario): void
     /**
      * @return array
      */
-    public function idsProvider(): array
+    public static function idsProvider(): array
     {
         return [
             'integers' => [static fn() => [1, 2, 3]],