Merge pull request #947 from ruudk/remove-pin

Sync with upstream `webonyx/graphql-php` changes

Author: mcg-web

composer.json

@@ -37,7 +37,7 @@
         "symfony/framework-bundle": "^4.4 || ^5.2",
         "symfony/options-resolver": "^4.4 || ^5.2",
         "symfony/property-access": "^4.4 || ^5.2",
-        "webonyx/graphql-php": "dev-master#d36e80962bd82b2f515617de50e0c87c8049bc3c"
+        "webonyx/graphql-php": "dev-master"
     },
     "suggest": {
         "nelmio/cors-bundle": "For more flexibility when using CORS prefight",

phpstan-baseline.neon

@@ -90,6 +90,16 @@ parameters:
 			count: 1
 			path: src/Config/Processor/BuilderProcessor.php
 
+		-
+			message: "#^Attribute class Overblog\\\\GraphQLBundle\\\\Definition\\\\ReturnTypeWillChange does not exist\\.$#"
+			count: 1
+			path: src/Definition/Argument.php
+
+		-
+			message: "#^Used constant ReturnTypeWillChange not found\\.$#"
+			count: 1
+			path: src/Definition/Argument.php
+
 		-
 			message: "#^Method Overblog\\\\GraphQLBundle\\\\Definition\\\\Builder\\\\TypeFactory\\:\\:create\\(\\) should return GraphQL\\\\Type\\\\Definition\\\\Type but returns object\\.$#"
 			count: 1
@@ -180,6 +190,11 @@ parameters:
 			count: 1
 			path: src/Validator/InputValidator.php
 
+		-
+			message: "#^Offset 'validation' on array\\{name\\: string, type\\: \\(callable\\(\\)\\: GraphQL\\\\Type\\\\Definition\\\\OutputType&GraphQL\\\\Type\\\\Definition\\\\Type\\)\\|\\(GraphQL\\\\Type\\\\Definition\\\\OutputType&GraphQL\\\\Type\\\\Definition\\\\Type\\), resolve\\?\\: \\(callable\\(mixed, array\\<string, mixed\\>, mixed, GraphQL\\\\Type\\\\Definition\\\\ResolveInfo\\)\\: mixed\\)\\|null, args\\?\\: array\\<string, array\\{name\\: string, defaultValue\\?\\: mixed, description\\?\\: string\\|null, astNode\\?\\: GraphQL\\\\Language\\\\AST\\\\InputValueDefinitionNode\\|null\\}\\|GraphQL\\\\Type\\\\Definition\\\\Type\\>\\|null, description\\?\\: string\\|null, deprecationReason\\?\\: string\\|null, astNode\\?\\: GraphQL\\\\Language\\\\AST\\\\FieldDefinitionNode\\|null, complexity\\?\\: \\(callable\\(int, array\\<string, mixed\\>\\)\\: int\\)\\|null\\} on left side of \\?\\? does not exist\\.$#"
+			count: 1
+			path: src/Validator/InputValidator.php
+
 		-
 			message: "#^Unsafe call to private method Overblog\\\\GraphQLBundle\\\\Validator\\\\InputValidator\\:\\:isListOfType\\(\\) through static\\:\\:\\.$#"
 			count: 1

src/EventListener/TypeDecoratorListener.php

@@ -6,6 +6,7 @@
 
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\InterfaceType;
+use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
@@ -56,12 +57,12 @@ public function decorateType(Type $type, ResolverMapInterface $resolverMap): voi
         } elseif ($type instanceof CustomScalarType) {
             $this->decorateCustomScalarType($type, $resolverMap);
         } else {
-            $covered = $resolverMap->covered($type->name);
+            $covered = $resolverMap->covered($type instanceof NamedType ? $type->name : null);
             if (!empty($covered)) {
                 throw new InvalidArgumentException(
                     sprintf(
                         '"%s".{"%s"} defined in resolverMap, but type is not managed by TypeDecorator.',
-                        $type->name,
+                        $type instanceof NamedType ? $type->name : get_class($type),
                         implode('", "', $covered)
                     )
                 );
@@ -86,10 +87,7 @@ private function decorateObjectType(ObjectType $type, ResolverMapInterface $reso
         $this->decorateObjectTypeFields($type, $fieldsResolved, $resolverMap);
     }
 
-    /**
-     * @param InterfaceType|UnionType $type
-     */
-    private function decorateInterfaceOrUnionType($type, ResolverMapInterface $resolverMap): void
+    private function decorateInterfaceOrUnionType(InterfaceType | UnionType $type, ResolverMapInterface $resolverMap): void
     {
         $this->configTypeMapping($type, ResolverMapInterface::RESOLVE_TYPE, $resolverMap);
         $covered = $resolverMap->covered($type->name);
@@ -190,7 +188,7 @@ private function decorateObjectTypeFields(ObjectType $type, array $fieldsResolve
         $type->config['fields'] = is_callable($fields) ? $decoratedFields : $decoratedFields();
     }
 
-    private function configTypeMapping(Type $type, string $fieldName, ResolverMapInterface $resolverMap): void
+    private function configTypeMapping(ObjectType | InterfaceType | UnionType | CustomScalarType $type, string $fieldName, ResolverMapInterface $resolverMap): void
     {
         if ($resolverMap->isResolvable($type->name, $fieldName)) {
             $type->config[substr($fieldName, 2)] = $resolverMap->resolve($type->name, $fieldName);

src/Validator/InputValidator.php

@@ -77,7 +77,7 @@ public function validate($groups = null, bool $throw = true): ?ConstraintViolati
 
         $this->buildValidationTree(
             $rootNode,
-            $this->info->fieldDefinition->config['args'],
+            $this->info->fieldDefinition->config['args'] ?? [],
             $classMapping,
             $this->resolverArgs->args->getArrayCopy()
         );
@@ -212,7 +212,7 @@ protected function buildValidationTree(ValidationNode $rootObject, array $fields
      */
     private static function isListOfType($type): bool
     {
-        if ($type instanceof ListOfType || ($type instanceof NonNull && $type->getOfType() instanceof ListOfType)) {
+        if ($type instanceof ListOfType || ($type instanceof NonNull && $type->getWrappedType() instanceof ListOfType)) {
             return true;
         }
 

src/Validator/ValidationNode.php

@@ -5,6 +5,7 @@
 namespace Overblog\GraphQLBundle\Validator;
 
 use GraphQL\Type\Definition\InputObjectType;
+use GraphQL\Type\Definition\NamedType;
 use GraphQL\Type\Definition\ObjectType;
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
@@ -30,9 +31,9 @@ class ValidationNode
     private ?string $__fieldName;
 
     /**
-     * @var ObjectType|InputObjectType|Type
+     * @var ObjectType|InputObjectType
      */
-    private Type $__type;
+    private NamedType $__type;
 
     /**
      * @var ValidationNode[]
@@ -45,7 +46,7 @@ class ValidationNode
     private ?ResolverArgs $__resolverArgs;
 
     public function __construct(
-        Type $type,
+        ObjectType | InputObjectType $type,
         string $field = null,
         ?ValidationNode $parent = null,
         ?ResolverArgs $resolverArgs = null

tests/EventListener/TypeDecoratorListenerTest.php

@@ -9,6 +9,7 @@
 use GraphQL\Type\Definition\InputObjectType;
 use GraphQL\Type\Definition\InterfaceType;
 use GraphQL\Type\Definition\ObjectType;
+use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
 use InvalidArgumentException;
@@ -29,10 +30,10 @@ class TypeDecoratorListenerTest extends TestCase
      *
      * @dataProvider specialTypeFieldProvider
      */
-    public function testSpecialField($fieldName, Type $typeWithSpecialField, callable $fieldValueRetriever = null, $strict = true): void
+    public function testSpecialField($fieldName, ObjectType | UnionType | InterfaceType | CustomScalarType $typeWithSpecialField, callable $fieldValueRetriever = null, $strict = true): void
     {
         if (null === $fieldValueRetriever) {
-            $fieldValueRetriever = fn (Type $type, $fieldName) => $type->config[$fieldName];
+            $fieldValueRetriever = fn (ObjectType | UnionType | InterfaceType | CustomScalarType $type, $fieldName) => $type->config[$fieldName];
         }
         $expected = static function (): void {
         };
@@ -106,7 +107,8 @@ public function testWrappedResolver(): void
         $expected = ['foo' => 'baz'];
         $resolveFn = $objectType->getField('bar')->resolveFn;
         /** @var Argument $args */
-        $args = $resolveFn(null, $expected);
+        $args = $resolveFn(null, $expected, [], $this->createMock(ResolveInfo::class));
+
         $this->assertInstanceOf(Argument::class, $args);
         $this->assertSame($expected, $args->getArrayCopy());
     }