Prefer property type hint over Doctrine annotation

Author: bartv2

src/Config/Parser/AnnotationParser.php

@@ -636,12 +636,24 @@ private static function getGraphQLInputFieldsFromAnnotations(GraphClass $graphCl
             }
 
             $fieldName = $reflector->getName();
-            $fieldType = $fieldAnnotation->type ?? null;
-            if (!$fieldType) {
-                if ($reflector instanceof ReflectionProperty && $reflector->hasType()) {
-                    $fieldType = self::resolveGraphQLTypeFromReflectionType($reflector->getType(), self::VALID_INPUT_TYPES);
-                } else {
-                    $fieldType = self::guessType($graphClass, $annotations);
+            if (isset($fieldAnnotation->type)) {
+                $fieldType = $fieldAnnotation->type;
+            } else {
+                if ($reflector instanceof ReflectionProperty) {
+                    if ($reflector->hasType()) {
+                        try {
+                            $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()));
+
+                        }
+                    }
                 }
             }
             $fieldConfiguration = [];

tests/Config/Parser/AnnotationParserTest.php

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

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

@@ -34,5 +34,11 @@ class Planet
      */
     protected $diameter;
 
+    /**
+      * @GQL\Field
+      * @ORM\Column(type="boolean")
+      */
+    protected int $variable;
+
     protected $dummy;
 }