Merge pull request #71 from Art4/phpunit-10

Update to PHPUnit 10
Art4 · Oct 13, 2023 · f5cc92c · f5cc92c
2 parents fddfbad + 23e3043
commit f5cc92c
Show file tree

Hide file tree

Showing 42 changed files with 86 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 .idea
 .php-cs-fixer.cache
-.phpunit.result.cache
+.phpunit.cache
 composer.phar
 composer.lock
 php-cs-fixer.phar

diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.2",
         "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9"
+        "phpunit/phpunit": "^9 || ^10"
     },
     "autoload": {
         "psr-4": {
@@ -31,6 +31,7 @@
         }
     },
     "scripts": {
+        "coverage": "phpunit --coverage-html=\".phpunit.cache/code-coverage\"",
         "phpstan": "phpstan analyze --memory-limit 512M --configuration .phpstan.neon",
         "phpunit": "phpunit"
     },

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" stopOnError="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         colors="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnIncompleteTests="true"
+         displayDetailsOnSkippedTests="true"
+         displayDetailsOnTestsThatTriggerDeprecations="true"
+         displayDetailsOnTestsThatTriggerErrors="true"
+         displayDetailsOnTestsThatTriggerNotices="true"
+         displayDetailsOnTestsThatTriggerWarnings="true"
+>
+  <coverage/>
   <testsuites>
     <testsuite name="all">
       <directory suffix="Test.php">tests/Unit/</directory>
@@ -18,4 +26,9 @@
       <directory suffix="Test.php">tests/Functional/</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/BC/AccessableTest.php b/tests/BC/AccessableTest.php
@@ -20,7 +20,7 @@
 namespace Art4\JsonApiClient\Tests\BC;
 
 use Art4\JsonApiClient\Accessable;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class AccessableTest extends TestCase
 {

diff --git a/tests/BC/ElementTest.php b/tests/BC/ElementTest.php
@@ -22,7 +22,7 @@
 use Art4\JsonApiClient\Accessable;
 use Art4\JsonApiClient\Element;
 use Art4\JsonApiClient\Manager;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ElementTest extends TestCase
 {

diff --git a/tests/BC/Exception/ExceptionTest.php b/tests/BC/Exception/ExceptionTest.php
@@ -20,7 +20,7 @@
 namespace Art4\JsonApiClient\Tests\BC\Exception;
 
 use Art4\JsonApiClient\Exception\Exception;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ExceptionTest extends TestCase
 {

diff --git a/tests/BC/FactoryTest.php b/tests/BC/FactoryTest.php
@@ -20,7 +20,7 @@
 namespace Art4\JsonApiClient\Tests\BC;
 
 use Art4\JsonApiClient\Factory;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class FactoryTest extends TestCase
 {

diff --git a/tests/BC/Input/InputTest.php b/tests/BC/Input/InputTest.php
@@ -20,7 +20,7 @@
 namespace Art4\JsonApiClient\Tests\BC\Input;
 
 use Art4\JsonApiClient\Input\Input;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class InputTest extends TestCase
 {

diff --git a/tests/BC/Input/RequestInputTest.php b/tests/BC/Input/RequestInputTest.php
@@ -20,7 +20,7 @@
 namespace Art4\JsonApiClient\Tests\BC\Input;
 
 use Art4\JsonApiClient\Input\RequestInput;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class RequestInputTest extends TestCase
 {

diff --git a/tests/BC/ManagerTest.php b/tests/BC/ManagerTest.php
@@ -21,7 +21,7 @@
 
 use Art4\JsonApiClient\Input\Input;
 use Art4\JsonApiClient\Manager;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ManagerTest extends TestCase
 {

diff --git a/tests/BC/Serializer/SerializerTest.php b/tests/BC/Serializer/SerializerTest.php
@@ -21,7 +21,7 @@
 
 use Art4\JsonApiClient\Accessable;
 use Art4\JsonApiClient\Serializer\Serializer;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class SerializerTest extends TestCase
 {

diff --git a/tests/Fixtures/HelperTrait.php b/tests/Fixtures/HelperTrait.php
@@ -19,6 +19,7 @@
 
 namespace Art4\JsonApiClient\Tests\Fixtures;
 
+use Art4\JsonApiClient\Accessable;
 use Art4\JsonApiClient\Factory;
 use Art4\JsonApiClient\Manager;
 use Art4\JsonApiClient\Tests\Fixtures\Factory as FixtureFactory;
@@ -28,12 +29,18 @@
  */
 trait HelperTrait
 {
+    protected Manager $manager;
+
+    protected Factory $factory;
+
+    protected Accessable $parent;
+
     /**
      * Json Values Provider
      *
      * @see http://json.org/
      */
-    public function jsonValuesProvider()
+    public static function jsonValuesProvider(): array
     {
         return [
             [new \stdClass()],
@@ -53,9 +60,9 @@ public function jsonValuesProvider()
      *
      * @see http://json.org/
      */
-    public function jsonValuesProviderWithoutObject()
+    public static function jsonValuesProviderWithoutObject(): array
     {
-        $data = $this->jsonValuesProvider();
+        $data = static::jsonValuesProvider();
 
         unset($data[0]);
 
@@ -67,9 +74,9 @@ public function jsonValuesProviderWithoutObject()
      *
      * @see http://json.org/
      */
-    public function jsonValuesProviderWithoutArray()
+    public static function jsonValuesProviderWithoutArray(): array
     {
-        $data = $this->jsonValuesProvider();
+        $data = static::jsonValuesProvider();
 
         unset($data[1]);
 
@@ -81,9 +88,9 @@ public function jsonValuesProviderWithoutArray()
      *
      * @see http://json.org/
      */
-    public function jsonValuesProviderWithoutString()
+    public static function jsonValuesProviderWithoutString(): array
     {
-        $data = $this->jsonValuesProvider();
+        $data = static::jsonValuesProvider();
 
         unset($data[2]);
 
@@ -95,9 +102,9 @@ public function jsonValuesProviderWithoutString()
      *
      * @see http://json.org/
      */
-    public function jsonValuesProviderWithoutObjectAndString()
+    public static function jsonValuesProviderWithoutObjectAndString(): array
     {
-        $data = $this->jsonValuesProvider();
+        $data = static::jsonValuesProvider();
 
         unset($data[0]);
         unset($data[2]);
@@ -110,7 +117,7 @@ public function jsonValuesProviderWithoutObjectAndString()
      *
      * @see http://json.org/
      */
-    public function jsonValuesAsStringProvider()
+    public static function jsonValuesAsStringProvider(): array
     {
         return [
             ['{}'],
@@ -130,9 +137,9 @@ public function jsonValuesAsStringProvider()
      *
      * @see http://json.org/
      */
-    public function jsonValuesAsStringProviderWithoutObject()
+    public static function jsonValuesAsStringProviderWithoutObject(): array
     {
-        $data = $this->jsonValuesAsStringProvider();
+        $data = static::jsonValuesAsStringProvider();
 
         unset($data[0]);
 

diff --git a/tests/Fixtures/TestCase.php b/tests/Fixtures/TestCase.php
diff --git a/tests/Functional/DotNotationTest.php b/tests/Functional/DotNotationTest.php
@@ -25,8 +25,9 @@
 use Art4\JsonApiClient\Manager\ErrorAbortManager;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
 use Art4\JsonApiClient\V1\Factory;
+use PHPUnit\Framework\TestCase;
 
-class DotNotationTest extends \Art4\JsonApiClient\Tests\Fixtures\TestCase
+class DotNotationTest extends TestCase
 {
     use HelperTrait;
 

diff --git a/tests/Functional/ErrorParsingTest.php b/tests/Functional/ErrorParsingTest.php
@@ -21,8 +21,9 @@
 
 use Art4\JsonApiClient\Helper\Parser;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
+use PHPUnit\Framework\TestCase;
 
-class ErrorParsingTest extends \Art4\JsonApiClient\Tests\Fixtures\TestCase
+class ErrorParsingTest extends TestCase
 {
     use HelperTrait;
 

diff --git a/tests/Functional/ParsingTest.php b/tests/Functional/ParsingTest.php
@@ -23,18 +23,18 @@
 use Art4\JsonApiClient\Helper\Parser;
 use Art4\JsonApiClient\Input\ResponseStringInput;
 use Art4\JsonApiClient\Manager\ErrorAbortManager;
-use Art4\JsonApiClient\Serializer\ArraySerializer;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
 use Art4\JsonApiClient\V1\Factory;
+use PHPUnit\Framework\TestCase;
 
-class ParsingTest extends \Art4\JsonApiClient\Tests\Fixtures\TestCase
+class ParsingTest extends TestCase
 {
     use HelperTrait;
 
     /**
      * Provide Parser
      */
-    public function createParserProvider()
+    public static function createParserProvider(): array
     {
         $errorAbortManagerParser = function ($string) {
             $manager = new ErrorAbortManager(new Factory());

diff --git a/tests/Functional/SerializerTest.php b/tests/Functional/SerializerTest.php
@@ -24,8 +24,8 @@
 use Art4\JsonApiClient\Manager\ErrorAbortManager;
 use Art4\JsonApiClient\Serializer\ArraySerializer;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
 use Art4\JsonApiClient\V1\Factory;
+use PHPUnit\Framework\TestCase;
 
 class SerializerTest extends TestCase
 {
@@ -34,7 +34,7 @@ class SerializerTest extends TestCase
     /**
      * Provide JSON API data
      */
-    public function jsonapiDataProvider()
+    public static function jsonapiDataProvider(): array
     {
         $path = str_replace('/', \DIRECTORY_SEPARATOR, __DIR__ . '/../files/');
         $files = [];

diff --git a/tests/Unit/Helper/ParserTest.php b/tests/Unit/Helper/ParserTest.php
@@ -20,10 +20,9 @@
 namespace Art4\JsonApiClient\Tests\Unit\Helper;
 
 use Art4\JsonApiClient\Exception\InputException;
-use Art4\JsonApiClient\Exception\ValidationException;
 use Art4\JsonApiClient\Helper\Parser;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
 use Art4\JsonApiClient\V1\Document;
+use PHPUnit\Framework\TestCase;
 
 class ParserTest extends TestCase
 {

diff --git a/tests/Unit/Input/RequestStringInputTest.php b/tests/Unit/Input/RequestStringInputTest.php
@@ -22,7 +22,7 @@
 use Art4\JsonApiClient\Exception\InputException;
 use Art4\JsonApiClient\Input\RequestStringInput;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class RequestStringInputTest extends TestCase
 {

diff --git a/tests/Unit/Input/ResponseStringInputTest.php b/tests/Unit/Input/ResponseStringInputTest.php
@@ -22,7 +22,7 @@
 use Art4\JsonApiClient\Exception\InputException;
 use Art4\JsonApiClient\Input\ResponseStringInput;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ResponseStringInputTest extends TestCase
 {

diff --git a/tests/Unit/Manager/ErrorAbortManagerTest.php b/tests/Unit/Manager/ErrorAbortManagerTest.php
@@ -21,7 +21,7 @@
 
 use Art4\JsonApiClient\Factory;
 use Art4\JsonApiClient\Manager\ErrorAbortManager;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ErrorAbortManagerTest extends TestCase
 {

diff --git a/tests/Unit/Serializer/ArraySerializerTest.php b/tests/Unit/Serializer/ArraySerializerTest.php
@@ -21,7 +21,7 @@
 
 use Art4\JsonApiClient\Accessable;
 use Art4\JsonApiClient\Serializer\ArraySerializer;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
+use PHPUnit\Framework\TestCase;
 
 class ArraySerializerTest extends TestCase
 {

diff --git a/tests/Unit/V1/AttributesTest.php b/tests/Unit/V1/AttributesTest.php
@@ -23,8 +23,8 @@
 use Art4\JsonApiClient\Exception\AccessException;
 use Art4\JsonApiClient\Exception\ValidationException;
 use Art4\JsonApiClient\Tests\Fixtures\HelperTrait;
-use Art4\JsonApiClient\Tests\Fixtures\TestCase;
 use Art4\JsonApiClient\V1\Attributes;
+use PHPUnit\Framework\TestCase;
 
 class AttributesTest extends TestCase
 {