adapt tests

simPod · simPod · commit 8ece38a5491e · 2025-03-10T14:58:34.000+01:00
diff --git a/composer.json b/composer.json
@@ -30,7 +30,7 @@
     "psr/http-message": "^1 || ^2",
     "react/http": "^1.6",
     "react/promise": "^2.0 || ^3.0",
-    "rector/rector": "^1.0",
+    "rector/rector": "^2.0",
     "symfony/polyfill-php81": "^1.23",
     "symfony/var-exporter": "^5 || ^6 || ^7",
     "thecodingmachine/safe": "^1.3 || ^2"
diff --git a/tests/Error/ErrorTest.php b/tests/Error/ErrorTest.php
@@ -4,6 +4,7 @@
 
 use GraphQL\Error\Error;
 use GraphQL\Error\FormattedError;
+use GraphQL\Language\AST\Node;
 use GraphQL\Language\AST\NullValueNode;
 use GraphQL\Language\AST\OperationDefinitionNode;
 use GraphQL\Language\Parser;
@@ -151,7 +152,8 @@ public function testDefaultErrorFormatterIncludesExtensionFields(): void
     public function testErrorReadsOverriddenMethods(): void
     {
         $error = new class('msg', null, null, [], null, null, ['foo' => 'bar']) extends Error {
-            public function getExtensions(): ?array
+            /** @return array<string, mixed> */
+            public function getExtensions(): array
             {
                 $extensions = parent::getExtensions();
                 $extensions['subfoo'] = 'subbar';
@@ -164,12 +166,13 @@ public function getPositions(): array
                 return [1 => 2];
             }
 
-            public function getSource(): ?Source
+            public function getSource(): Source
             {
                 return new Source('');
             }
 
-            public function getNodes(): ?array
+            /** @return list<Node> */
+            public function getNodes(): array
             {
                 return [];
             }
@@ -183,12 +186,14 @@ public function getNodes(): ?array
         self::assertNotNull($locatedError->getSource());
 
         $error = new class('msg', new NullValueNode([]), null, []) extends Error {
-            public function getNodes(): ?array
+            /** @return list<NullValueNode> */
+            public function getNodes(): array
             {
                 return [new NullValueNode([])];
             }
 
-            public function getPath(): ?array
+            /** @return list<string> */
+            public function getPath(): array
             {
                 return ['path'];
             }
diff --git a/tests/Executor/AbstractTest.php b/tests/Executor/AbstractTest.php
@@ -718,16 +718,20 @@ public function testResolveTypeAllowsResolvingWithTypeName(): void
 
     public function testHintsOnConflictingTypeInstancesInResolveType(): void
     {
-        /** @var InterfaceType $iface */
+        /** @var InterfaceType|null $iface */
         $iface = null;
 
-        $createTest = static function () use (&$iface): ObjectType {
+        $createTest = function () use (&$iface): ObjectType {
             return new ObjectType([
                 'name' => 'Test',
                 'fields' => [
                     'a' => Type::string(),
                 ],
-                'interfaces' => static fn (): array => [$iface],
+                'interfaces' => function () use ($iface): array {
+                    self::assertNotNull($iface);
+
+                    return [$iface];
+                },
             ]);
         };
 
diff --git a/tests/Executor/ExecutorTest.php b/tests/Executor/ExecutorTest.php
@@ -230,7 +230,7 @@ public function testProvidesInfoAboutCurrentExecutionState(): void
     {
         $ast = Parser::parse('query ($var: String) { result: test }');
 
-        /** @var ResolveInfo $info */
+        /** @var ResolveInfo|null $info */
         $info = null;
         $schema = new Schema([
             'query' => new ObjectType([
@@ -250,6 +250,8 @@ public function testProvidesInfoAboutCurrentExecutionState(): void
 
         Executor::execute($schema, $ast, $rootValue, null, ['var' => '123']);
 
+        self::assertNotNull($info);
+
         /** @var OperationDefinitionNode $operationDefinition */
         $operationDefinition = $ast->definitions[0];
 
@@ -327,7 +329,7 @@ public function testCorrectlyThreadsArguments(): void
             ]),
         ]);
         Executor::execute($schema, $docAst, null, null, [], 'Example');
-        self::assertSame($gotHere, true);
+        self::assertTrue($gotHere);
     }
 
     public function testArgsMapper(): void
@@ -400,7 +402,7 @@ public function testArgsMapper(): void
         $result = Executor::execute($schema, $docAst);
         self::assertSame(1, $mapperCalledCount);
         self::assertSame(3, $resolverCalledCount);
-        self::assertCount(0, $result->errors);
+        self::assertEmpty($result->errors);
     }
 
     /** @see it('nulls out error subtrees') */
diff --git a/tests/Executor/Promise/ReactPromiseAdapterTest.php b/tests/Executor/Promise/ReactPromiseAdapterTest.php
@@ -39,7 +39,6 @@ public function setUp(): void
 
     public function testIsThenableReturnsTrueWhenAReactPromiseIsGiven(): void
     {
-        /** @var callable $reactPromiseSetRejectionHandler */
         $reactPromiseSetRejectionHandler = \function_exists('\React\Promise\set_rejection_handler')
             ? '\React\Promise\set_rejection_handler'
             : fn ($error) => null;
diff --git a/tests/Executor/Promise/SyncPromiseTest.php b/tests/Executor/Promise/SyncPromiseTest.php
@@ -110,6 +110,7 @@ static function () use (&$onRejectedCalled): void {
             self::assertNotSame($promise, $nextPromise);
             self::assertSame(SyncPromise::PENDING, $nextPromise->state);
         } else {
+            /** @phpstan-ignore argument.unresolvableType (false positive?)  */
             self::assertSame(SyncPromise::FULFILLED, $nextPromise->state);
         }
 
@@ -282,6 +283,7 @@ static function () use (&$onFulfilledCalled): void {
             self::assertNotSame($promise, $nextPromise);
             self::assertSame(SyncPromise::PENDING, $nextPromise->state);
         } else {
+            /** @phpstan-ignore argument.unresolvableType (false positive?)  */
             self::assertSame(SyncPromise::REJECTED, $nextPromise->state);
         }
 
@@ -389,7 +391,7 @@ public function testPendingPromiseThen(): void
         $nextPromise3 = $promise->then($onFulfilled, $onRejected);
         $nextPromise4 = $promise->then($onFulfilled, $onRejected);
 
-        self::assertCount(0, SyncPromise::getQueue());
+        self::assertEmpty(SyncPromise::getQueue());
         self::assertSame(0, $onFulfilledCount);
         self::assertSame(0, $onRejectedCount);
         $promise->resolve(1);
@@ -403,7 +405,7 @@ public function testPendingPromiseThen(): void
         self::assertSame(SyncPromise::PENDING, $nextPromise4->state);
 
         SyncPromise::runQueue();
-        self::assertCount(0, SyncPromise::getQueue());
+        self::assertEmpty(SyncPromise::getQueue());
         self::assertSame(3, $onFulfilledCount); // @phpstan-ignore-line side-effects
         self::assertSame(0, $onRejectedCount); // @phpstan-ignore-line side-effects
         self::assertValidPromise($nextPromise, 1, null, SyncPromise::FULFILLED);
diff --git a/tests/PhpStan/Type/Definition/Type/IsAbstractTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsAbstractTypeStaticMethodTypeSpecifyingExtension.php
@@ -37,6 +37,6 @@ public function isStaticMethodSupported(MethodReflection $staticMethodReflection
 
     public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
     {
-        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(AbstractType::class), $context);
+        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(AbstractType::class), $context, $scope);
     }
 }
diff --git a/tests/PhpStan/Type/Definition/Type/IsCompositeTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsCompositeTypeStaticMethodTypeSpecifyingExtension.php
@@ -37,6 +37,6 @@ public function isStaticMethodSupported(MethodReflection $staticMethodReflection
 
     public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
     {
-        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(CompositeType::class), $context);
+        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(CompositeType::class), $context, $scope);
     }
 }
diff --git a/tests/PhpStan/Type/Definition/Type/IsInputTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsInputTypeStaticMethodTypeSpecifyingExtension.php
@@ -37,6 +37,6 @@ public function isStaticMethodSupported(MethodReflection $staticMethodReflection
 
     public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
     {
-        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(InputType::class), $context);
+        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(InputType::class), $context, $scope);
     }
 }
diff --git a/tests/PhpStan/Type/Definition/Type/IsOutputTypeStaticMethodTypeSpecifyingExtension.php b/tests/PhpStan/Type/Definition/Type/IsOutputTypeStaticMethodTypeSpecifyingExtension.php
@@ -37,6 +37,6 @@ public function isStaticMethodSupported(MethodReflection $staticMethodReflection
 
     public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
     {
-        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(OutputType::class), $context);
+        return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(OutputType::class), $context, $scope);
     }
 }
diff --git a/tests/StarWarsSchema.php b/tests/StarWarsSchema.php
@@ -85,10 +85,10 @@ public static function build(): Schema
             ],
         ]);
 
-        /** @var ObjectType $humanType */
+        /** @var ObjectType|null $humanType */
         $humanType = null;
 
-        /** @var ObjectType $droidType */
+        /** @var ObjectType|null $droidType */
         $droidType = null;
 
         /**
@@ -136,10 +136,14 @@ public static function build(): Schema
                     ],
                 ];
             },
-            'resolveType' => static function (array $obj) use (&$humanType, &$droidType): ObjectType {
-                return StarWarsData::human($obj['id']) === null
+            'resolveType' => function (array $obj) use (&$humanType, &$droidType): ObjectType {
+                $objectType = StarWarsData::human($obj['id']) === null
                     ? $droidType
                     : $humanType;
+
+                assert($objectType !== null);
+
+                return $objectType;
             },
         ]);
 
diff --git a/tests/Type/QueryPlanTest.php b/tests/Type/QueryPlanTest.php
@@ -734,7 +734,7 @@ public function testMergedFragmentsQueryPlan(): void
         ];
 
         $hasCalled = false;
-        /** @var QueryPlan $queryPlan */
+        /** @var QueryPlan|null $queryPlan */
         $queryPlan = null;
 
         $blogQuery = new ObjectType([
@@ -763,6 +763,8 @@ public function testMergedFragmentsQueryPlan(): void
         $schema = new Schema(['query' => $blogQuery]);
         $result = GraphQL::executeQuery($schema, $doc)->toArray();
 
+        self::assertNotNull($queryPlan);
+
         self::assertTrue($hasCalled);
         self::assertSame(['data' => ['article' => null]], $result);
         self::assertEquals($expectedQueryPlan, $queryPlan->queryPlan());
@@ -961,7 +963,7 @@ public function testQueryPlanGroupingImplementorFieldsForAbstractTypes(): void
         $expectedBuildingSubFields = ['city', 'address'];
 
         $hasCalled = false;
-        /** @var QueryPlan $queryPlan */
+        /** @var QueryPlan|null $queryPlan */
         $queryPlan = null;
 
         $root = new ObjectType([
@@ -987,6 +989,8 @@ public function testQueryPlanGroupingImplementorFieldsForAbstractTypes(): void
         ]);
         $result = GraphQL::executeQuery($schema, $query)->toArray();
 
+        self::assertNotNull($queryPlan);
+
         self::assertTrue($hasCalled);
         self::assertSame($expectedResult, $result);
         self::assertSame($expectedQueryPlan, $queryPlan->queryPlan());
diff --git a/tests/Utils/BuildSchemaTest.php b/tests/Utils/BuildSchemaTest.php
@@ -406,7 +406,7 @@ interface EmptyInterface
 
         $definition = Parser::parse($sdl)->definitions[0];
         self::assertInstanceOf(InterfaceTypeDefinitionNode::class, $definition);
-        self::assertCount(0, $definition->interfaces, 'The interfaces property must be an empty list.');
+        self::assertEmpty($definition->interfaces, 'The interfaces property must be an empty list.');
 
         self::assertCycle($sdl);
     }
@@ -1451,15 +1451,15 @@ interface Hello {
         self::assertSame(['Query'], $created);
 
         $schema->getType('Color');
-        /** @var array<string> $created reset the type for PHPStan */
+        /** @var mixed $created reset the type for PHPStan */
         self::assertSame(['Query', 'Color'], $created);
 
         $schema->getType('Hello');
-        /** @var array<string> $created reset the type for PHPStan */
+        /** @var mixed $created reset the type for PHPStan */
         self::assertSame(['Query', 'Color', 'Hello'], $created);
 
         $types = $schema->getTypeMap();
-        /** @var array<string> $created reset the type for PHPStan */
+        /** @var mixed $created reset the type for PHPStan */
         self::assertSame(['Query', 'Color', 'Hello', 'World'], $created);
 
         self::assertArrayHasKey('Query', $types);
diff --git a/tests/Utils/SchemaExtenderTest/SomeInterfaceClassType.php b/tests/Utils/SchemaExtenderTest/SomeInterfaceClassType.php
@@ -13,7 +13,7 @@ final class SomeInterfaceClassType extends InterfaceType
 {
     public ObjectType $concrete;
 
-    public function resolveType($objectValue, $context, ResolveInfo $info)
+    public function resolveType($objectValue, $context, ResolveInfo $info): ObjectType
     {
         return $this->concrete;
     }
diff --git a/tests/Utils/SchemaExtenderTest/SomeUnionClassType.php b/tests/Utils/SchemaExtenderTest/SomeUnionClassType.php
@@ -13,7 +13,7 @@ final class SomeUnionClassType extends UnionType
 {
     public ObjectType $concrete;
 
-    public function resolveType($objectValue, $context, ResolveInfo $info)
+    public function resolveType($objectValue, $context, ResolveInfo $info): ObjectType
     {
         return $this->concrete;
     }

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`use GraphQL\Error\Error;`
`6`	`6`	`use GraphQL\Error\FormattedError;`
	`7`	`+use GraphQL\Language\AST\Node;`
`7`	`8`	`use GraphQL\Language\AST\NullValueNode;`
`8`	`9`	`use GraphQL\Language\AST\OperationDefinitionNode;`
`9`	`10`	`use GraphQL\Language\Parser;`
`@@ -151,7 +152,8 @@ public function testDefaultErrorFormatterIncludesExtensionFields(): void`
`151`	`152`	`public function testErrorReadsOverriddenMethods(): void`
`152`	`153`	`{`
`153`	`154`	`$error = new class('msg', null, null, [], null, null, ['foo' => 'bar']) extends Error {`
`154`		`- public function getExtensions(): ?array`
	`155`	`+ /** @return array<string, mixed> */`
	`156`	`+ public function getExtensions(): array`
`155`	`157`	`{`
`156`	`158`	`$extensions = parent::getExtensions();`
`157`	`159`	`$extensions['subfoo'] = 'subbar';`
`@@ -164,12 +166,13 @@ public function getPositions(): array`
`164`	`166`	`return [1 => 2];`
`165`	`167`	`}`
`166`	`168`
`167`		`- public function getSource(): ?Source`
	`169`	`+ public function getSource(): Source`
`168`	`170`	`{`
`169`	`171`	`return new Source('');`
`170`	`172`	`}`
`171`	`173`
`172`		`- public function getNodes(): ?array`
	`174`	`+ /** @return list<Node> */`
	`175`	`+ public function getNodes(): array`
`173`	`176`	`{`
`174`	`177`	`return [];`
`175`	`178`	`}`
`@@ -183,12 +186,14 @@ public function getNodes(): ?array`
`183`	`186`	`self::assertNotNull($locatedError->getSource());`
`184`	`187`
`185`	`188`	`$error = new class('msg', new NullValueNode([]), null, []) extends Error {`
`186`		`- public function getNodes(): ?array`
	`189`	`+ /** @return list<NullValueNode> */`
	`190`	`+ public function getNodes(): array`
`187`	`191`	`{`
`188`	`192`	`return [new NullValueNode([])];`
`189`	`193`	`}`
`190`	`194`
`191`		`- public function getPath(): ?array`
	`195`	`+ /** @return list<string> */`
	`196`	`+ public function getPath(): array`
`192`	`197`	`{`
`193`	`198`	`return ['path'];`
`194`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ public function setUp(): void`
`39`	`39`
`40`	`40`	`public function testIsThenableReturnsTrueWhenAReactPromiseIsGiven(): void`
`41`	`41`	`{`
`42`		`- /** @var callable $reactPromiseSetRejectionHandler */`
`43`	`42`	`$reactPromiseSetRejectionHandler = \function_exists('\React\Promise\set_rejection_handler')`
`44`	`43`	`? '\React\Promise\set_rejection_handler'`
`45`	`44`	`: fn ($error) => null;`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,6 @@ public function isStaticMethodSupported(MethodReflection $staticMethodReflection`
`37`	`37`
`38`	`38`	`public function specifyTypes(MethodReflection $staticMethodReflection, StaticCall $node, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes`
`39`	`39`	`{`
`40`		`- return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(AbstractType::class), $context);`
	`40`	`+ return $this->typeSpecifier->create($node->getArgs()[0]->value, new ObjectType(AbstractType::class), $context, $scope);`
`41`	`41`	`}`
`42`	`42`	`}`