Fix resolver args wrapper BC

Definition/ConfigProcessor/AclConfigProcessor.php

@@ -3,7 +3,6 @@
 namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
 
 use GraphQL\Type\Definition\ResolveInfo;
-use Overblog\GraphQLBundle\Definition\Argument;
 use Overblog\GraphQLBundle\Definition\LazyConfig;
 use Overblog\GraphQLBundle\Error\UserWarning;
 use Overblog\GraphQLBundle\Resolver\AccessResolver;
@@ -37,7 +36,7 @@ public static function acl(array $fields, AccessResolver $accessResolver, callab
                         $resolverCallback = self::findFieldResolver($field, $info, $defaultResolver);
                         $isMutation = 'mutation' === $info->operation->operation && $info->parentType === $info->schema->getMutationType();
 
-                        return $accessResolver->resolve($accessChecker, $resolverCallback, [$value, new Argument($args), $context, $info], $isMutation);
+                        return $accessResolver->resolve($accessChecker, $resolverCallback, [$value, $args, $context, $info], $isMutation);
                     };
                 }
             }

Definition/ConfigProcessor/WrapArgumentConfigProcessor.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Definition\ConfigProcessor;
+
+use Overblog\GraphQLBundle\Definition\LazyConfig;
+use Overblog\GraphQLBundle\Resolver\Resolver;
+
+final class WrapArgumentConfigProcessor implements ConfigProcessorInterface
+{
+    public function process(LazyConfig $lazyConfig)
+    {
+        $lazyConfig->addPostLoader(function ($config) {
+            if (isset($config['resolveField']) && is_callable($config['resolveField'])) {
+                $config['resolveField'] = Resolver::wrapArgs($config['resolveField']);
+            }
+
+            if (isset($config['fields'])) {
+                $config['fields'] = function () use ($config) {
+                    $fields = $config['fields'];
+                    if (is_callable($config['fields'])) {
+                        $fields = $config['fields']();
+                    }
+
+                    return self::wrapFieldsArgument($fields);
+                };
+            }
+
+            return $config;
+        });
+
+        return $lazyConfig;
+    }
+
+    private static function wrapFieldsArgument(array $fields)
+    {
+        foreach ($fields as &$field) {
+            if (isset($field['resolve']) && is_callable($field['resolve'])) {
+                $field['resolve'] = Resolver::wrapArgs($field['resolve']);
+            }
+        }
+
+        return $fields;
+    }
+}

Definition/Type/SchemaDecorator.php

@@ -9,7 +9,7 @@
 use GraphQL\Type\Definition\Type;
 use GraphQL\Type\Definition\UnionType;
 use GraphQL\Type\Schema;
-use Overblog\GraphQLBundle\Definition\Argument;
+use Overblog\GraphQLBundle\Resolver\Resolver;
 use Overblog\GraphQLBundle\Resolver\ResolverMapInterface;
 
 class SchemaDecorator
@@ -49,7 +49,7 @@ private function decorateObjectType(ObjectType $type, ResolverMapInterface $reso
             if (ResolverMapInterface::IS_TYPEOF === $fieldName) {
                 $this->configTypeMapping($type, $resolverMap, ResolverMapInterface::IS_TYPEOF);
             } elseif (ResolverMapInterface::RESOLVE_FIELD === $fieldName) {
-                $resolveFieldFn = self::wrapResolver($resolverMap->resolve($type->name, ResolverMapInterface::RESOLVE_FIELD));
+                $resolveFieldFn = Resolver::wrapArgs($resolverMap->resolve($type->name, ResolverMapInterface::RESOLVE_FIELD));
                 $type->config[substr(ResolverMapInterface::RESOLVE_FIELD, 2)] = $resolveFieldFn;
                 $type->resolveFieldFn = $resolveFieldFn;
             } else {
@@ -139,7 +139,7 @@ private function decorateObjectTypeFields(ObjectType $type, ResolverMapInterface
                 $fieldName = isset($field['name']) ? $field['name'] : $key;
 
                 if ($resolverMap->isResolvable($type->name, $fieldName)) {
-                    $field['resolve'] = self::wrapResolver($resolverMap->resolve($type->name, $fieldName));
+                    $field['resolve'] = Resolver::wrapArgs($resolverMap->resolve($type->name, $fieldName));
                 }
 
                 $fieldNames[] = $fieldName;
@@ -164,16 +164,4 @@ private function configTypeMapping(Type $type, ResolverMapInterface $resolverMap
             $type->config[substr($fieldName, 2)] = $resolverMap->resolve($type->name, $fieldName);
         }
     }
-
-    private static function wrapResolver(callable $resolver)
-    {
-        return static function () use ($resolver) {
-            $args = func_get_args();
-            if (count($args) > 1) {
-                $args[1] = new Argument($args[1]);
-            }
-
-            return call_user_func_array($resolver, $args);
-        };
-    }
 }

Resolver/Resolver.php

@@ -3,6 +3,7 @@
 namespace Overblog\GraphQLBundle\Resolver;
 
 use GraphQL\Type\Definition\ResolveInfo;
+use Overblog\GraphQLBundle\Definition\Argument;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
 
@@ -44,6 +45,18 @@ public static function setObjectOrArrayValue(&$objectOrArray, $fieldName, $value
         }
     }
 
+    public static function wrapArgs(callable $resolver)
+    {
+        return static function () use ($resolver) {
+            $args = func_get_args();
+            if (count($args) > 1) {
+                $args[1] = new Argument($args[1]);
+            }
+
+            return $resolver(...$args);
+        };
+    }
+
     private static function isReadable($objectOrArray, $indexOrProperty)
     {
         return self::getAccessor()->isReadable($objectOrArray, $indexOrProperty);

Resources/config/definition_config_processors.yml

@@ -11,5 +11,11 @@ services:
             - '@overblog_graphql.access_resolver'
             - "%overblog_graphql.default_resolver%"
         public: false
+        tags:
+            - { name: overblog_graphql.definition_config_processor, priority: 512 }
+
+    Overblog\GraphQLBundle\Definition\ConfigProcessor\WrapArgumentConfigProcessor:
+        class: Overblog\GraphQLBundle\Definition\ConfigProcessor\WrapArgumentConfigProcessor
+        public: false
         tags:
             - { name: overblog_graphql.definition_config_processor }

Tests/Functional/App/config/argumentWrapper/config.yml

@@ -0,0 +1,15 @@
+imports:
+    - { resource: ../config.yml }
+
+overblog_graphql:
+    errors_handler:
+            debug: true
+    definitions:
+        class_namespace: "Overblog\\GraphQLBundle\\ArgumentWrapper\\__DEFINITIONS__"
+        schema:
+            query: RootQuery
+        mappings:
+            types:
+                -
+                    type: yaml
+                    dir: "%kernel.root_dir%/config/argumentWrapper/mapping"

Tests/Functional/App/config/argumentWrapper/mapping/query.types.yml

@@ -0,0 +1,16 @@
+RootQuery:
+    type: object
+    config:
+        resolveField: '@="Arguments: " ~ args["unknown"] ~ args["name"]'
+        fields:
+            fieldWithResolverAndArgument:
+                type: String!
+                args:
+                    name: {type: String!}
+                resolve: '@="Arguments: " ~ args["unknown"] ~ args["name"]'
+            fieldWithDefaultResolverAndArgument:
+                type: String!
+                args:
+                    name: {type: String!}
+            field:
+                type: String!

Tests/Functional/ArgumentWrapper/ArgumentWrapperTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Overblog\GraphQLBundle\Tests\Functional\AutoMapping;
+
+use Overblog\GraphQLBundle\Tests\Functional\TestCase;
+
+class ArgumentWrapperTest extends TestCase
+{
+    protected function setUp()
+    {
+        static::bootKernel(['test_case' => 'argumentWrapper']);
+    }
+
+    public function testQuery()
+    {
+        $query = '{ fieldWithResolverAndArgument(name: "foo") fieldWithDefaultResolverAndArgument(name: "bar") field }';
+        $expectedData = [
+            'fieldWithResolverAndArgument' => 'Arguments: foo',
+            'fieldWithDefaultResolverAndArgument' => 'Arguments: bar',
+            'field' => 'Arguments: ',
+        ];
+
+        $this->assertGraphQL($query, $expectedData);
+    }
+}