Merge pull request #1151 from mathroc/patch-2

Merge guessed argument properties and args described with GQL\Arg

Author: Vincz

src/Config/Parser/MetadataParser/MetadataParser.php

@@ -570,8 +570,8 @@ private static function getTypeFieldConfigurationFromReflector(ReflectionClass $
             }
         }
 
-        if (empty($argAnnotations) && $reflector instanceof ReflectionMethod) {
-            $args = self::guessArgs($reflectionClass, $reflector);
+        if ($reflector instanceof ReflectionMethod) {
+            $args = self::guessArgs($reflectionClass, $reflector, $args);
         }
 
         if (!empty($args)) {
@@ -924,10 +924,16 @@ private static function guessType(ReflectionClass $reflectionClass, Reflector $r
     /**
      * Transform a method arguments from reflection to a list of GraphQL argument.
      */
-    private static function guessArgs(ReflectionClass $reflectionClass, ReflectionMethod $method): array
-    {
-        $arguments = [];
+    private static function guessArgs(
+        ReflectionClass $reflectionClass,
+        ReflectionMethod $method,
+        array $arguments,
+    ): array {
         foreach ($method->getParameters() as $index => $parameter) {
+            if (array_key_exists($parameter->getName(), $arguments)) {
+                continue;
+            }
+
             try {
                 $gqlType = self::guessType($reflectionClass, $parameter, self::VALID_INPUT_TYPES);
             } catch (TypeGuessingException $exception) {

tests/Config/Parser/MetadataParserTest.php

@@ -452,15 +452,15 @@ public function testArgsAndReturnGuessing(): void
                     'type' => 'Int',
                     'args' => [
                         'areaId' => ['type' => 'Int!'],
-                        'raceId' => ['type' => 'String!'],
+                        'raceId' => ['type' => 'String!', 'description' => 'A race ID'],
                         'dayStart' => ['type' => 'Int', 'defaultValue' => null],
                         'dayEnd' => ['type' => 'Int', 'defaultValue' => null],
                         'nameStartingWith' => ['type' => 'String', 'defaultValue' => ''],
                         'planet' => ['type' => 'PlanetInput', 'defaultValue' => null],
                         'away' => ['type' => 'Boolean', 'defaultValue' => false],
                         'maxDistance' => ['type' => 'Float', 'defaultValue' => null],
                     ],
-                    'resolve' => '@=call(value.getCasualties, arguments({areaId: "Int!", raceId: "String!", dayStart: "Int", dayEnd: "Int", nameStartingWith: "String", planet: "PlanetInput", away: "Boolean", maxDistance: "Float"}, args))',
+                    'resolve' => '@=call(value.getCasualties, arguments({raceId: "String!", areaId: "Int!", dayStart: "Int", dayEnd: "Int", nameStartingWith: "String", planet: "PlanetInput", away: "Boolean", maxDistance: "Float"}, args))',
                     'complexity' => '@=childrenComplexity * 5',
                 ],
             ],

tests/Config/Parser/fixtures/annotations/Type/Battle.php

@@ -21,11 +21,14 @@ final class Battle
 
     /**
      * @GQL\Field(name="casualties", complexity="childrenComplexity * 5")
+     *
+     * @GQL\Arg(name="raceId", type="String!", description="A race ID")
      */
     #[GQL\Field(name: 'casualties', complexity: 'childrenComplexity * 5')]
+    #[GQL\Arg(name: 'raceId', type: 'String!', description: 'A race ID')]
     public function getCasualties(
         int $areaId,
-        string $raceId,
+        ?string $raceId,
         int $dayStart = null,
         int $dayEnd = null,
         string $nameStartingWith = '',