Fix check of compatible parent type

vojtech-dobes · vojtech-dobes · commit a723f1ddedfa · 2025-06-04T14:14:58.000+02:00
diff --git a/src/GraphQL/CorrespondanceRule.php b/src/GraphQL/CorrespondanceRule.php
@@ -264,7 +264,7 @@ private function listFieldResolvedValueTypes(
 			$expectedParentType = $resolverClassType->getTemplateType(Vojtechdobes\GraphQL\FieldResolver::class, 'TObjectValue');
 
 			foreach ($this->listObjectTypeResolvedValueTypes($scope, $schemaServiceOraculum, $objectType) as $parentType) {
-				if ($parentType->isSuperTypeOf($expectedParentType)->yes() === false) {
+				if ($expectedParentType->isSuperTypeOf($parentType)->yes() === false) {
 					$errors[] = sprintf(
 						"Resolver %s of field %s expects parent to be %s, but parent is resolved to %s",
 						$resolverClassType->describe(PHPStan\Type\VerbosityLevel::precise()),
diff --git a/tests-shared/AbstractCorrespondanceRuleTest.php b/tests-shared/AbstractCorrespondanceRuleTest.php
@@ -41,7 +41,19 @@ final public function testRule(): void
 				-1,
 			],
 			[
-				"Resolver Vojtechdobes\TestsShared\Resolvers\InvalidParentTypeNameFieldResolver of field InvalidParentType.name expects parent to be Vojtechdobes\TestsShared\Resolvers\Person, but parent is resolved to array{}",
+				"Resolver Vojtechdobes\TestsShared\Resolvers\PersonParentTypeNameFieldResolver of field PersonParentType.name expects parent to be Vojtechdobes\TestsShared\Resolvers\Person, but parent is resolved to array{}",
+				-1,
+			],
+			[
+				"Resolver Vojtechdobes\TestsShared\Resolvers\PersonParentTypeNameFieldResolver of field PersonParentType.name expects parent to be Vojtechdobes\TestsShared\Resolvers\Person, but parent is resolved to Vojtechdobes\TestsShared\Resolvers\Entity",
+				-1,
+			],
+			[
+				"Resolver Vojtechdobes\TestsShared\Resolvers\PersonParentTypeNameFieldResolver of field PersonParentType.name expects parent to be Vojtechdobes\TestsShared\Resolvers\Person, but parent is resolved to Vojtechdobes\TestsShared\Resolvers\Thing",
+				-1,
+			],
+			[
+				"Resolver Vojtechdobes\TestsShared\Resolvers\EntityParentTypeNameFieldResolver of field EntityParentType.name expects parent to be Vojtechdobes\TestsShared\Resolvers\Entity, but parent is resolved to array{}",
 				-1,
 			],
 		]);
diff --git a/tests-shared/Resolvers/Entity.php b/tests-shared/Resolvers/Entity.php
@@ -0,0 +1,11 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+
+interface Entity
+{
+
+	public readonly string $name;
+
+}
diff --git a/tests-shared/Resolvers/EntityParentTypeNameFieldResolver.php b/tests-shared/Resolvers/EntityParentTypeNameFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<Entity, string>
+ */
+final class EntityParentTypeNameFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return $objectValue->name;
+	}
+
+}
diff --git a/tests-shared/Resolvers/Person.php b/tests-shared/Resolvers/Person.php
@@ -3,7 +3,7 @@
 namespace Vojtechdobes\TestsShared\Resolvers;
 
 
-final class Person
+final class Person implements Entity
 {
 
 	public function __construct(
diff --git a/tests-shared/Resolvers/PersonParentTypeNameFieldResolver.php b/tests-shared/Resolvers/PersonParentTypeNameFieldResolver.php
@@ -8,7 +8,7 @@
 /**
  * @implements Vojtechdobes\GraphQL\FieldResolver<Person, string>
  */
-final class InvalidParentTypeNameFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+final class PersonParentTypeNameFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
 {
 
 	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
diff --git a/tests-shared/Resolvers/QueryProviderOfInvalidEntityParentTypeArrayFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfInvalidEntityParentTypeArrayFieldResolver.php
@@ -8,7 +8,7 @@
 /**
  * @implements Vojtechdobes\GraphQL\FieldResolver<null, array{}>
  */
-final class QueryProviderOfInvalidParentTypeFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+final class QueryProviderOfInvalidEntityParentTypeArrayFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
 {
 
 	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
diff --git a/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeArrayFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeArrayFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, array{}>
+ */
+final class QueryProviderOfInvalidPersonParentTypeArrayFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return [];
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeEntityFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeEntityFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Entity>
+ */
+final class QueryProviderOfInvalidPersonParentTypeEntityFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Person(name: 'Almond');
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeThingFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfInvalidPersonParentTypeThingFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Thing>
+ */
+final class QueryProviderOfInvalidPersonParentTypeThingFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Thing(name: 'Almond');
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypeEntityFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypeEntityFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Entity>
+ */
+final class QueryProviderOfValidEntityParentTypeEntityFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Thing(name: 'Almong');
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypePersonFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypePersonFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Person>
+ */
+final class QueryProviderOfValidEntityParentTypePersonFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Person(name: 'Alice');
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypeThingFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfValidEntityParentTypeThingFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Thing>
+ */
+final class QueryProviderOfValidEntityParentTypeThingFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Thing(name: 'Almond');
+	}
+
+}
diff --git a/tests-shared/Resolvers/QueryProviderOfValidPersonParentTypePersonFieldResolver.php b/tests-shared/Resolvers/QueryProviderOfValidPersonParentTypePersonFieldResolver.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+use Vojtechdobes;
+
+
+/**
+ * @implements Vojtechdobes\GraphQL\FieldResolver<null, Person>
+ */
+final class QueryProviderOfValidPersonParentTypePersonFieldResolver implements Vojtechdobes\GraphQL\FieldResolver
+{
+
+	public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed
+	{
+		return new Person(name: 'Almond');
+	}
+
+}
diff --git a/tests-shared/Resolvers/Thing.php b/tests-shared/Resolvers/Thing.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Vojtechdobes\TestsShared\Resolvers;
+
+
+final class Thing implements Entity
+{
+
+	public function __construct(
+		public readonly string $name,
+	) {}
+
+}
diff --git a/tests-shared/schema.graphqls b/tests-shared/schema.graphqls
@@ -9,18 +9,30 @@ type Query {
 	arrayType: ArrayType!
 	objectType: ObjectType!
 
-	providerOfInvalidParentType: InvalidParentType!
+	providerOfInvalidPersonParentTypeArray: PersonParentType!
+	providerOfInvalidPersonParentTypeEntity: PersonParentType!
+	providerOfInvalidPersonParentTypeThing: PersonParentType!
+	providerOfValidPersonParentTypePerson: PersonParentType!
+
+	providerOfInvalidEntityParentTypeArray: EntityParentType!
+	providerOfValidEntityParentTypeEntity: EntityParentType!
+	providerOfValidEntityParentTypePerson: EntityParentType!
+	providerOfValidEntityParentTypeThing: EntityParentType!
 }
 
 type ArrayType {
 	a: String!
 }
 
-type InvalidParentType {
-	name: String!
-}
-
 type ObjectType {
 	withGetter: String!
 	withProperty: String!
 }
+
+type PersonParentType {
+	name: String!
+}
+
+type EntityParentType {
+	name: String!
+}
diff --git a/tests/CustomAdapter.php b/tests/CustomAdapter.php
@@ -42,8 +42,18 @@ public function getFieldResolverProvider(string $schemaName): Vojtechdobes\Graph
 			'ObjectType.withGetter' => new Vojtechdobes\GraphQL\GetterFieldResolver(),
 			'ObjectType.withProperty' => new Vojtechdobes\GraphQL\PropertyFieldResolver(),
 
-			'Query.providerOfInvalidParentType' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfInvalidParentTypeFieldResolver(),
-			'InvalidParentType.name' => new Vojtechdobes\TestsShared\Resolvers\InvalidParentTypeNameFieldResolver(),
+			'Query.providerOfInvalidPersonParentTypeArray' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfInvalidPersonParentTypeArrayFieldResolver(),
+			'Query.providerOfInvalidPersonParentTypeEntity' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfInvalidPersonParentTypeEntityFieldResolver(),
+			'Query.providerOfInvalidPersonParentTypeThing' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfInvalidPersonParentTypeThingFieldResolver(),
+			'Query.providerOfValidPersonParentTypePerson' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfValidPersonParentTypePersonFieldResolver(),
+
+			'Query.providerOfInvalidEntityParentTypeArray' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfInvalidEntityParentTypeArrayFieldResolver(),
+			'Query.providerOfValidEntityParentTypeEntity' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfValidEntityParentTypeEntityFieldResolver(),
+			'Query.providerOfValidEntityParentTypePerson' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfValidEntityParentTypePersonFieldResolver(),
+			'Query.providerOfValidEntityParentTypeThing' => new Vojtechdobes\TestsShared\Resolvers\QueryProviderOfValidEntityParentTypeThingFieldResolver(),
+
+			'PersonParentType.name' => new Vojtechdobes\TestsShared\Resolvers\PersonParentTypeNameFieldResolver(),
+			'EntityParentType.name' => new Vojtechdobes\TestsShared\Resolvers\EntityParentTypeNameFieldResolver(),
 		]);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`namespace Vojtechdobes\TestsShared\Resolvers;`
`4`	`4`
`5`	`5`
`6`		`-final class Person`
	`6`	`+final class Person implements Entity`
`7`	`7`	`{`
`8`	`8`
`9`	`9`	`public function __construct(`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`/**`
`9`	`9`	`* @implements Vojtechdobes\GraphQL\FieldResolver<Person, string>`
`10`	`10`	`*/`
`11`		`-final class InvalidParentTypeNameFieldResolver implements Vojtechdobes\GraphQL\FieldResolver`
	`11`	`+final class PersonParentTypeNameFieldResolver implements Vojtechdobes\GraphQL\FieldResolver`
`12`	`12`	`{`
`13`	`13`
`14`	`14`	`public function resolveField(mixed $objectValue, Vojtechdobes\GraphQL\FieldSelection $field): mixed`