Merge pull request #560 from mcg-web/fix-resolver-alias-when-using-autoconfig

Fix resolver aliases when using autoconfig

Author: mcg-web

src/DependencyInjection/Compiler/ResolverMethodAliasesPass.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\DependencyInjection\Compiler;
+
+use Overblog\GraphQLBundle\Definition\Resolver\AliasedInterface;
+use Overblog\GraphQLBundle\Definition\Resolver\MutationInterface;
+use Overblog\GraphQLBundle\Definition\Resolver\ResolverInterface;
+use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Definition;
+
+final class ResolverMethodAliasesPass implements CompilerPassInterface
+{
+    private const SERVICE_SUBCLASS_TAG_MAPPING = [
+        MutationInterface::class => 'overblog_graphql.mutation',
+        ResolverInterface::class => 'overblog_graphql.resolver',
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(ContainerBuilder $container): void
+    {
+        foreach ($container->getDefinitions() as $definition) {
+            foreach (self::SERVICE_SUBCLASS_TAG_MAPPING as $tagName) {
+                $this->addDefinitionTagsFromClassReflection($definition, $tagName);
+            }
+        }
+    }
+
+    private function addDefinitionTagsFromClassReflection(Definition $definition, string $tagName): void
+    {
+        if ($definition->hasTag($tagName)) {
+            foreach ($definition->getTag($tagName) as $tag => $attributes) {
+                if (!isset($attributes['method'])) {
+                    $reflectionClass = new \ReflectionClass($definition->getClass());
+
+                    if (!$reflectionClass->isAbstract()) {
+                        $publicReflectionMethods = $reflectionClass->getMethods(\ReflectionMethod::IS_PUBLIC);
+                        $isAliased = $reflectionClass->implementsInterface(AliasedInterface::class);
+                        foreach ($publicReflectionMethods as $publicReflectionMethod) {
+                            if ('__construct' === $publicReflectionMethod->name || $isAliased && 'getAliases' === $publicReflectionMethod->name) {
+                                continue;
+                            }
+                            $definition->addTag($tagName, ['method' => $publicReflectionMethod->name]);
+                        }
+                    }
+                    continue;
+                }
+            }
+        }
+    }
+}

src/OverblogGraphQLBundle.php

@@ -10,6 +10,7 @@
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\ExpressionFunctionPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\GlobalVariablesPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\MutationTaggedServiceMappingTaggedPass;
+use Overblog\GraphQLBundle\DependencyInjection\Compiler\ResolverMethodAliasesPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\ResolverTaggedServiceMappingPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\TypeGeneratorPass;
 use Overblog\GraphQLBundle\DependencyInjection\Compiler\TypeTaggedServiceMappingPass;
@@ -40,6 +41,7 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new ConfigProcessorPass());
         $container->addCompilerPass(new GlobalVariablesPass());
         $container->addCompilerPass(new ExpressionFunctionPass());
+        $container->addCompilerPass(new ResolverMethodAliasesPass());
         $container->addCompilerPass(new AliasedPass());
         $container->addCompilerPass(new TypeGeneratorPass(), PassConfig::TYPE_BEFORE_REMOVING);
         $container->addCompilerPass(new TypeTaggedServiceMappingPass(), PassConfig::TYPE_BEFORE_REMOVING);

tests/Functional/App/GraphQL/HelloWord/Type/QueryType.php

@@ -23,7 +23,7 @@ public function __construct(ResolverResolver $resolver)
                         'message' => ['type' => Type::string()],
                     ],
                     'resolve' => function ($root, $args) use ($resolver) {
-                        return $resolver->resolve([EchoResolver::class, [$args['message']]]);
+                        return $resolver->resolve([\sprintf('%s::display', EchoResolver::class), [$args['message']]]);
                     },
                 ],
             ],

tests/Functional/App/IsolatedResolver/EchoResolver.php

@@ -12,7 +12,7 @@ final class EchoResolver implements ResolverInterface, ContainerAwareInterface
 {
     use ContainerAwareTrait;
 
-    public function __invoke($message)
+    public function display($message): string
     {
         return $this->container->getParameter('echo.prefix').$message;
     }

tests/Functional/App/config/autoConfigure/config.yml

@@ -0,0 +1,18 @@
+imports:
+    - { resource: ../config.yml }
+parameters:
+    echo.prefix: "You said: "
+
+overblog_graphql:
+    definitions:
+        schema:
+            query: "Query"
+            mutation: "Calc"
+
+services:
+    _defaults:
+        autowire: true
+        autoconfigure: true
+    Overblog\GraphQLBundle\Tests\Functional\App\GraphQL\:
+        resource: '../../GraphQL/*'
+    Overblog\GraphQLBundle\Tests\Functional\App\IsolatedResolver\EchoResolver: ~

tests/Functional/AutoConfigure/HelloWordTest.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Overblog\GraphQLBundle\Tests\Functional\AutoConfigure;
+
+use Overblog\GraphQLBundle\Tests\Functional\TestCase;
+
+/**
+ * @group legacy
+ */
+class HelloWordTest extends TestCase
+{
+    protected function setUp(): void
+    {
+        static::bootKernel(['test_case' => 'autoConfigure']);
+    }
+
+    public function testQuery(): void
+    {
+        $query = 'query { echo(message: "This is my message!") }';
+        $expectedData = ['echo' => 'You said: This is my message!'];
+
+        $this->assertGraphQL($query, $expectedData);
+    }
+
+    public function testMutation(): void
+    {
+        $query = 'mutation { sum(x: 5, y: 15) }';
+        $expectedData = ['sum' => 20];
+
+        $this->assertGraphQL($query, $expectedData);
+    }
+}