Merge pull request #13 from andrey-mokhov/fix-for-query-mutation-addi…

…tional fix: couldn't use several attributes for one method with QueryField, MutationField or several AdditionalField
andrey-mokhov · Feb 14, 2024 · 8dd5df9 · 8dd5df9
2 parents 4b95970 + bba7d42
commit 8dd5df9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 16 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     "type": "library",
     "require": {
         "php": "^8.1",
-        "andi-lab/graphql-php": "^1.0",
+        "andi-lab/graphql-php": "^1.0.1",
         "spiral/framework": "^3.8.4"
     },
     "license": "MIT",

diff --git a/src/Listener/AbstractAdditionalFieldListener.php b/src/Listener/AbstractAdditionalFieldListener.php
@@ -5,16 +5,15 @@
 namespace Andi\GraphQL\Spiral\Listener;
 
 use Andi\GraphQL\Attribute\AbstractField;
+use Andi\GraphQL\Common\ReflectionMethodWithAttribute;
 use Andi\GraphQL\TypeRegistryInterface;
-use ReflectionClass;
-use ReflectionMethod;
 use Spiral\Attributes\ReaderInterface;
 use Spiral\Tokenizer\TokenizationListenerInterface;
 
 abstract class AbstractAdditionalFieldListener implements TokenizationListenerInterface
 {
     /**
-     * @var array<ReflectionMethod>
+     * @var array<ReflectionMethodWithAttribute>
      */
     protected array $methods = [];
 
@@ -27,7 +26,7 @@ public function __construct(
     ) {
     }
 
-    public function listen(ReflectionClass $class): void
+    public function listen(\ReflectionClass $class): void
     {
         if ($class->isAbstract() || $class->isEnum() || $class->isTrait()) {
             return;
@@ -38,8 +37,8 @@ public function listen(ReflectionClass $class): void
                 continue;
             }
 
-            if (null !== $this->reader->firstFunctionMetadata($method, $this->attribute)) {
-                $this->methods[] = $method;
+            if ($attribute = $this->reader->firstFunctionMetadata($method, $this->attribute)) {
+                $this->methods[] = new ReflectionMethodWithAttribute($method, $attribute);
             }
         }
     }

diff --git a/src/Listener/AdditionalFieldListener.php b/src/Listener/AdditionalFieldListener.php
@@ -5,6 +5,7 @@
 namespace Andi\GraphQL\Spiral\Listener;
 
 use Andi\GraphQL\Attribute\AdditionalField;
+use Andi\GraphQL\Common\ReflectionMethodWithAttribute;
 use Andi\GraphQL\Type\DynamicObjectTypeInterface;
 use Spiral\Tokenizer\Attribute\TargetAttribute;
 
@@ -16,11 +17,11 @@ final class AdditionalFieldListener extends AbstractAdditionalFieldListener
     public function finalize(): void
     {
         foreach ($this->methods as $method) {
-            foreach ($this->reader->getFunctionMetadata($method, $this->attribute) as $attribute) {
+            foreach ($this->reader->getFunctionMetadata($method->method, $this->attribute) as $attribute) {
                 $type = $this->typeRegistry->get($attribute->targetType);
 
                 if ($type instanceof DynamicObjectTypeInterface) {
-                    $type->addAdditionalField($method);
+                    $type->addAdditionalField(new ReflectionMethodWithAttribute($method->method, $attribute));
                 }
             }
         }

diff --git a/tests/Feature/GraphQLTest.php b/tests/Feature/GraphQLTest.php
@@ -113,14 +113,14 @@ public static function getData(): iterable
         yield 'query echo' => [
             'expected' => [
                 'data' => [
-                    'echo' => 'echo: hello',
+                    'queryEcho' => 'echo: hello',
                 ],
             ],
             'data' => [
                 'operationName' => null,
                 'variables' => new \stdClass(),
                 'query' => <<<'QUERY'
-                    {echo(message:"hello")}
+                    {queryEcho(message:"hello")}
                     QUERY,
             ],
         ];
@@ -135,7 +135,7 @@ public static function getData(): iterable
                 'operationName' => null,
                 'variables' => ['mess' => 'foo'],
                 'query' => <<<'QUERY'
-                    mutation tst($mess: String!) {tmp: echo(message:$mess)}
+                    mutation tst($mess: String!) {tmp: mutationEcho(message:$mess)}
                     QUERY,
             ],
         ];

diff --git a/tests/Unit/Listener/AttributedTypeLoaderListenerTest.php b/tests/Unit/Listener/AttributedTypeLoaderListenerTest.php
@@ -12,7 +12,6 @@
 use Andi\GraphQL\Spiral\Listener\AttributedTypeLoaderListener;
 use Andi\GraphQL\TypeRegistry;
 use Andi\GraphQL\TypeRegistryInterface;
-use Andi\GraphQL\TypeResolver\CantResolveGraphQLTypeResolver;
 use Andi\GraphQL\TypeResolver\Middleware\AttributedGraphQLTypeMiddleware;
 use Andi\GraphQL\TypeResolver\Middleware\EnumTypeMiddleware;
 use Andi\GraphQL\TypeResolver\TypeResolver;
@@ -40,7 +39,9 @@ protected function setUp(): void
         $container = new Container();
         $reader = new NativeAttributeReader();
 
-        $this->typeRegistry = new TypeRegistry();
+        $typeRegistry = $this->typeRegistry = new TypeRegistry();
+
+        $container->bindSingleton(TypeRegistryInterface::class, static fn () => $typeRegistry);
 
         $typeResolver = new TypeResolver();
         $typeResolver->pipe(new EnumTypeMiddleware($reader));

diff --git a/tests/dirs/app/src/SimpleService.php b/tests/dirs/app/src/SimpleService.php
@@ -14,8 +14,8 @@
  */
 final class SimpleService
 {
-    #[QueryField(name: 'echo')]
-    #[MutationField(name: 'echo')]
+    #[QueryField(name: 'queryEcho')]
+    #[MutationField(name: 'mutationEcho')]
     public function echoMessage(#[Argument] string $message): string
     {
         return 'echo: ' . $message;