Update dev libraries

.phpstan.neon

@@ -17,42 +17,6 @@ parameters:
 	treatPhpDocTypesAsCertain: false
 
 	ignoreErrors:
-		-
-			message: "#^Constructor of class Art4\\\\JsonApiClient\\\\V1\\\\ResourceNull has an unused parameter \\$data\\.$#"
-			count: 1
-			path: src/V1/ResourceNull.php
-			# parameter is required by Art4\JsonApiClient\Element
-
-		-
-			message: "#^Constructor of class Art4\\\\JsonApiClient\\\\V1\\\\ResourceNull has an unused parameter \\$manager\\.$#"
-			count: 1
-			path: src/V1/ResourceNull.php
-			# parameter is required by Art4\JsonApiClient\Element
-
-		-
-			message: "#^Constructor of class Art4\\\\JsonApiClient\\\\V1\\\\ResourceNull has an unused parameter \\$parent\\.$#"
-			count: 1
-			path: src/V1/ResourceNull.php
-			# parameter is required by Art4\JsonApiClient\Element
-
-		-
-			message: "#^Constructor of an anonymous class has an unused parameter \\$data\\.$#"
-			count: 1
-			path: tests/BC/ElementTest.php
-			# parameter is required by Art4\JsonApiClient\Element
-
-		-
-			message: "#^Constructor of an anonymous class has an unused parameter \\$manager\\.$#"
-			count: 1
-			path: tests/BC/ElementTest.php
-			# parameter is required by Art4\JsonApiClient\Element
-
-		-
-			message: "#^Constructor of an anonymous class has an unused parameter \\$parent\\.$#"
-			count: 1
-			path: tests/BC/ElementTest.php
-			# parameter is required by Art4\JsonApiClient\Element
-
 		-
 			message: "#^Parameter \\#1 \\$string of class Art4\\\\JsonApiClient\\\\Input\\\\RequestStringInput constructor expects string, mixed given\\.$#"
 			count: 1

composer.json

@@ -17,9 +17,9 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.64",
-        "phpstan/phpstan": "^1.10",
-        "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^10.4"
+        "phpstan/phpstan": "^2.0",
+        "phpstan/phpstan-phpunit": "^2.0",
+        "phpunit/phpunit": "^10.4 || ^11.0 || ^12.0"
     },
     "autoload": {
         "psr-4": {

tests/BC/AccessableTest.php

@@ -59,6 +59,7 @@ public function getKeys()
             }
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Accessable::class, $class);
     }
 }

tests/BC/ElementTest.php

@@ -38,6 +38,7 @@ public function testBcForElementInterface(): void
             public function __construct($data, Manager $manager, Accessable $parent) {}
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Element::class, $class);
     }
 }

tests/BC/Exception/ExceptionTest.php

@@ -25,6 +25,7 @@ public function testBcForExceptionInterface(): void
          */
         $class = new class implements Exception {};
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Exception::class, $class);
     }
 }

tests/BC/FactoryTest.php

@@ -38,6 +38,7 @@ public function make($name, array $args = [])
             }
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Factory::class, $class);
     }
 }

tests/BC/Input/InputTest.php

@@ -30,8 +30,6 @@ public function testBcForInputInterface(): void
              * This should be a native PH stdClass object, so Manager could
              * iterate over all public attributes
              *
-             * @throws \Art4\JsonApiClient\Exception\InputException if something went wrong with the input
-             *
              * @return \stdClass
              */
             public function getAsObject()
@@ -40,6 +38,7 @@ public function getAsObject()
             }
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Input::class, $class);
     }
 }

tests/BC/Input/RequestInputTest.php

@@ -25,6 +25,7 @@ public function testBcForRequestInputInterface(): void
          */
         $class = new class implements RequestInput {};
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(RequestInput::class, $class);
     }
 }

tests/BC/ManagerTest.php

@@ -30,9 +30,6 @@ public function testBcForManagerInterface(): void
              *
              * @param \Art4\JsonApiClient\Input\Input $input
              *
-             * @throws \Art4\JsonApiClient\Exception\InputException If $input contains invalid JSON API
-             * @throws \Art4\JsonApiClient\Exception\ValidationException If $input contains invalid JSON API
-             *
              * @return \Art4\JsonApiClient\Accessable
              */
             public function parse(Input $input)
@@ -64,6 +61,7 @@ public function getParam($key, $default)
             }
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Manager::class, $class);
     }
 }

tests/BC/Serializer/SerializerTest.php

@@ -38,6 +38,7 @@ public function serialize(Accessable $data)
             }
         };
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Serializer::class, $class);
     }
 }

tests/Fixtures/HelperTrait.php

@@ -166,7 +166,7 @@ public function setUpManagerMock(): void
 
         $this->manager->expects($this->any())
             ->method('getFactory')
-            ->will($this->returnValue($factory));
+            ->willReturn($factory);
 
         $this->manager->expects($this->any())
             ->method('getParam')
@@ -177,7 +177,7 @@ public function setUpManagerMock(): void
     /**
      * returns a json string from a file
      */
-    protected function getJsonString(mixed $filename): string
+    protected function getJsonString(string $filename): string
     {
         return strval(file_get_contents(__DIR__ . '/../files/' . $filename));
     }

tests/Fixtures/V1Factory.php

@@ -9,6 +9,7 @@
 namespace Art4\JsonApiClient\Tests\Fixtures;
 
 use Art4\JsonApiClient\Factory as FactoryInterface;
+use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\TestCase;
 
 final class V1Factory implements FactoryInterface
@@ -33,11 +34,9 @@ public function __construct(TestCase $testcase)
      */
     public function make($name, array $args = [])
     {
-        return $this->testcase->getMockBuilder(AccessableElement::class)
+        return (new MockBuilder($this->testcase, AccessableElement::class))
             ->disableOriginalConstructor()
             ->disableOriginalClone()
-            ->disableArgumentCloning()
-            ->disallowMockingUnknownTypes()
             ->getMock();
     }
 }

tests/Unit/Input/RequestStringInputTest.php

@@ -22,6 +22,7 @@ public function testGetAsObjectFromStringReturnsObject(): void
     {
         $input = new RequestStringInput('{}');
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(\stdClass::class, $input->getAsObject());
     }
 

tests/Unit/Input/ResponseStringInputTest.php

@@ -22,6 +22,7 @@ public function testGetAsObjectFromStringReturnsObject(): void
     {
         $input = new ResponseStringInput('{}');
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(\stdClass::class, $input->getAsObject());
     }
 

tests/Unit/Serializer/ArraySerializerTest.php

@@ -23,15 +23,15 @@ public function testSerialize(): void
         $object2 = new \stdClass();
 
         $data = $this->createMock(Accessable::class);
-        $data->method('get')->will($this->returnValueMap([
+        $data->method('get')->willReturnMap([
             ['AccessObject', $object1],
             ['object', $object2],
             ['array', []],
             ['string', 'string'],
             ['integer', 1],
             ['boolean', true],
             ['null', null],
-        ]));
+        ]);
         $data->method('getKeys')->willReturn([
             'AccessObject',
             'object',
@@ -64,14 +64,14 @@ public function testRecursiveSerialize(): void
         $stdObject->key = 'value';
 
         $object1 = $this->createMock(Accessable::class);
-        $object1->method('get')->will($this->returnValueMap([
+        $object1->method('get')->willReturnMap([
             ['object', $stdObject],
             ['array', []],
             ['string', 'string'],
             ['integer', 1],
             ['boolean', true],
             ['null', null],
-        ]));
+        ]);
         $object1->method('getKeys')->willReturn([
             'object',
             'array',
@@ -82,9 +82,9 @@ public function testRecursiveSerialize(): void
         ]);
 
         $data = $this->createMock(Accessable::class);
-        $data->method('get')->will($this->returnValueMap([
+        $data->method('get')->willReturnMap([
             ['AccessObject', $object1],
-        ]));
+        ]);
         $data->method('getKeys')->willReturn([
             'AccessObject',
         ]);

tests/Unit/V1/AttributesTest.php

@@ -52,6 +52,7 @@ public function testCreateWithObject(): void
             $this->parent
         );
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Accessable::class, $attributes);
         $this->assertTrue($attributes->has('object'));
         $this->assertIsObject($attributes->get('object'));

tests/Unit/V1/DocumentLinkTest.php

@@ -33,7 +33,7 @@ public function setUp(): void
         $this->parent->expects($this->any())
             ->method('has')
             ->with('data')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
     }
 
     /**
@@ -59,6 +59,7 @@ public function testOnlySelfRelatedPaginationPropertiesExists(): void
 
         $link = new DocumentLink($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Accessable::class, $link);
         $this->assertSame([
             'self',

tests/Unit/V1/DocumentTest.php

@@ -42,7 +42,9 @@ public function testCreateWithObjectReturnsSelf(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Accessable::class, $document);
         $this->assertSame($document->getKeys(), ['meta']);
         $this->assertTrue($document->has('meta'));
@@ -74,6 +76,7 @@ public function testCreateWithAllPossibleValues(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertSame($document->getKeys(), ['data', 'meta', 'included', 'jsonapi', 'links']);
         $this->assertTrue($document->has('data'));
@@ -135,6 +138,7 @@ public function testCreateDataWithResourceIdentifier(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('data'));
 
@@ -156,6 +160,7 @@ public function testCreateDataWithResourceIdentifierAndMeta(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
 
         $this->assertTrue($document->has('data'));
@@ -178,6 +183,7 @@ public function testCreateDataWithResourceItem(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('data'));
 
@@ -198,6 +204,7 @@ public function testCreateDataWithResourceCollectionIdentifiers(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('data'));
 
@@ -220,6 +227,7 @@ public function testCreateDataWithResourceCollectionResources(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('data'));
 
@@ -240,6 +248,7 @@ public function testCreateWithDataproviderInValue(mixed $input): void
 
             $document = new Document($object, $this->manager, $this->parent);
 
+            /** @phpstan-ignore-next-line */
             $this->assertInstanceOf(Document::class, $document);
             $this->assertTrue($document->has('data'));
 
@@ -257,6 +266,7 @@ public function testCreateWithDataproviderInValue(mixed $input): void
 
             $document = new Document($object, $this->manager, $this->parent);
 
+            /** @phpstan-ignore-next-line */
             $this->assertInstanceOf(Document::class, $document);
             $this->assertTrue($document->has('data'));
 
@@ -289,6 +299,7 @@ public function testCreateWithErrorsArray(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertSame($document->getKeys(), ['errors']);
         $this->assertTrue($document->has('errors'));
@@ -323,6 +334,7 @@ public function testCreateWithMetaObject(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('meta'));
 
@@ -341,6 +353,7 @@ public function testCreateWithJsonapiObject(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('jsonapi'));
 
@@ -359,6 +372,7 @@ public function testCreateWithLinkObject(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('links'));
 
@@ -383,6 +397,7 @@ public function testCreateWithIncludedObjects(): void
 
         $document = new Document($object, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Document::class, $document);
         $this->assertTrue($document->has('included'));
 

tests/Unit/V1/ErrorCollectionTest.php

@@ -44,7 +44,9 @@ public function testCreate(): void
 
         $collection = new ErrorCollection($errors, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(ErrorCollection::class, $collection);
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(Accessable::class, $collection);
 
         $this->assertSame($collection->getKeys(), [0, 1]);
@@ -94,6 +96,7 @@ public function testGetErrorWithEmptyCollectionThrowsException(): void
 
         $collection = new ErrorCollection($errors, $this->manager, $this->parent);
 
+        /** @phpstan-ignore-next-line */
         $this->assertInstanceOf(ErrorCollection::class, $collection);
 
         $this->assertFalse($collection->has(1));