Refactor guessType to also check property type hint

Author: bartv2

src/Config/Parser/AnnotationParser.php

@@ -5,6 +5,7 @@
 namespace Overblog\GraphQLBundle\Config\Parser;
 
 use Doctrine\Common\Annotations\AnnotationException;
+use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping\Column;
 use Doctrine\ORM\Mapping\JoinColumn;
 use Doctrine\ORM\Mapping\ManyToMany;
@@ -585,7 +586,7 @@ private static function getTypeFieldConfigurationFromReflector(GraphClass $graph
                     }
                 } else {
                     try {
-                        $fieldConfiguration['type'] = self::guessType($graphClass, $annotations);
+                        $fieldConfiguration['type'] = self::guessType($graphClass, $reflector, self::VALID_OUTPUT_TYPES);
                     } catch (Exception $e) {
                         throw new InvalidArgumentException(sprintf('The attribute "type" on "@%s" defined on "%s" is required and cannot be auto-guessed : %s.', $fieldAnnotationName, $reflector->getName(), $e->getMessage()));
                     }
@@ -639,22 +640,11 @@ private static function getGraphQLInputFieldsFromAnnotations(GraphClass $graphCl
             if (isset($fieldAnnotation->type)) {
                 $fieldType = $fieldAnnotation->type;
             } else {
-                if ($reflector instanceof ReflectionProperty) {
-                    if ($reflector->hasType()) {
-                        try {
-                            // @phpstan-ignore-next-line
-                            $fieldType = self::resolveGraphQLTypeFromReflectionType($reflector->getType(), self::VALID_INPUT_TYPES);
-                        } catch (Exception $e) {
-                            throw new InvalidArgumentException(sprintf('The attribute "type" on GraphQL annotation "@%s" is missing on property "%s" and cannot be auto-guessed from type hint "%s"', GQL\Field::class, $reflector->getName(), (string) $reflector->getType()));
-                        }
-                    } else {
-                        try {
-                            $fieldType = self::guessType($graphClass, $annotations);
-                        } catch (Exception $e) {
-                            throw new InvalidArgumentException(sprintf('The attribute "type" on GraphQL annotation "@%s" is missing on property "%s" and cannot be auto-guessed as there is no type hint or Doctrine annotation.', GQL\Field::class, $reflector->getName()));
+                try {
+                    $fieldType = self::guessType($graphClass, $reflector, self::VALID_INPUT_TYPES);
+                } catch (Exception $e) {
+                    throw new InvalidArgumentException(sprintf('The attribute "type" on GraphQL annotation "@%s" is missing on property "%s" and cannot be auto-guessed as there is no type hint or Doctrine annotation.', GQL\Field::class, $reflector->getName()));
 
-                        }
-                    }
                 }
             }
             $fieldConfiguration = [];
@@ -864,8 +854,17 @@ private static function suffixName(string $name, string $suffix): string
      *
      * @throws RuntimeException
      */
-    private static function guessType(GraphClass $graphClass, array $annotations): string
+    private static function guessType(GraphClass $graphClass, ReflectionProperty $reflector, array $filterGraphQLTypes = []): string
     {
+        if ($reflector->hasType()) {
+            try {
+                // @phpstan-ignore-next-line
+                return self::resolveGraphQLTypeFromReflectionType($reflector->getType(), $filterGraphQLTypes);
+            } catch (Exception $e) {
+            }
+        }
+
+        $annotations = $graphClass->getAnnotations($reflector);
         $columnAnnotation = self::getFirstAnnotationMatching($annotations, Column::class);
         if (null !== $columnAnnotation) {
             $type = self::resolveTypeFromDoctrineType($columnAnnotation->type);

tests/Config/Parser/AnnotationParserTest.php

@@ -191,6 +191,7 @@ public function testInput(): void
                 'description' => ['type' => 'String!'],
                 'diameter' => ['type' => 'Int'],
                 'variable' => ['type' => 'Int!'],
+                'tags' => ['type' => '[String]!'],
             ],
         ]);
     }

tests/Config/Parser/fixtures/annotations/Input/Planet.php

@@ -43,4 +43,10 @@ class Planet
 
     // @phpstan-ignore-next-line
     protected $dummy;
+
+    /**
+     * @GQL\Field
+     * @ORM\Column(type="text[]")
+     */
+    protected array $tags;
 }

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

@@ -13,7 +13,7 @@
 class Droid extends Character
 {
     /**
-     * @GQL\Field(type="Int!")
+     * @GQL\Field
      */
     protected int $memory;
 }

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

@@ -23,38 +23,44 @@ class Lightsaber
      * @ORM\Column(type="integer", nullable=true)
      * @GQL\Field
      */
-    protected int $size;
+    // @phpstan-ignore-next-line
+    protected $size;
 
     /**
      * @ORM\OneToMany(targetEntity="Hero")
      * @GQL\Field
      */
-    protected Hero $holders;
+    // @phpstan-ignore-next-line
+    protected $holders;
 
     /**
      * @ORM\ManyToOne(targetEntity="Hero")
      * @GQL\Field
      */
-    protected Hero $creator;
+    // @phpstan-ignore-next-line
+    protected $creator;
 
     /**
      * @ORM\OneToOne(targetEntity="Crystal")
      * @GQL\Field
      */
-    protected Crystal $crystal;
+    // @phpstan-ignore-next-line
+    protected $crystal;
 
     /**
      * @ORM\ManyToMany(targetEntity="Battle")
      * @GQL\Field
      */
-    protected Battle $battles;
+    // @phpstan-ignore-next-line
+    protected $battles;
 
     /**
      * @GQL\Field
      * @ORM\OneToOne(targetEntity="Hero")
      * @ORM\JoinColumn(nullable=true)
      */
-    protected Hero $currentHolder;
+    // @phpstan-ignore-next-line
+    protected $currentHolder;
 
     /**
      * @GQL\Field