Merge f78a5d5 into a223567

Author: mathroc

src/Config/Parser/MetadataParser/MetadataParser.php

@@ -556,22 +556,22 @@ private static function getTypeFieldConfigurationFromReflector(ReflectionClass $
         /** @var Metadata\Arg[] $argAnnotations */
         $argAnnotations = self::getMetadataMatching($metadatas, Metadata\Arg::class);
 
+        if ($reflector instanceof ReflectionMethod) {
+            $args = self::guessArgs($reflectionClass, $reflector);
+        }
+
         foreach ($argAnnotations as $arg) {
-            $args[$arg->name] = ['type' => $arg->type];
+            $args[$arg->name] ??= ['type' => $arg->type];
 
             if (isset($arg->description)) {
                 $args[$arg->name]['description'] = $arg->description;
             }
 
             if (isset($arg->default)) {
-                $args[$arg->name]['defaultValue'] = $arg->default;
+                $args[$arg->name]['defaultValue'] ??= $arg->default;
             }
         }
 
-        if (empty($argAnnotations) && $reflector instanceof ReflectionMethod) {
-            $args = self::guessArgs($reflectionClass, $reflector);
-        }
-
         if (!empty($args)) {
             $fieldConfiguration['args'] = $args;
         }