Fix MagicField & SourceField to include $annotations parameter (#564)

Author: oprypkhantc

src/Annotations/MagicField.php

@@ -46,8 +46,11 @@ class MagicField implements SourceFieldInterface
     /** @var array<string, ParameterAnnotations> */
     private $parameterAnnotations;
 
-    /** @param mixed[] $attributes */
-    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null, string|null $phpType = null, string|null $description = null, string|null $sourceName = null)
+    /**
+     * @param mixed[] $attributes
+     * @param array<MiddlewareAnnotationInterface|ParameterAnnotationInterface> $annotations
+     */
+    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null, string|null $phpType = null, string|null $description = null, string|null $sourceName = null, array $annotations = [])
     {
         $this->name = $attributes['name'] ?? $name;
         $this->outputType = $attributes['outputType'] ?? $outputType ?? null;
@@ -63,7 +66,7 @@ public function __construct(array $attributes = [], string|null $name = null, st
         }
         $middlewareAnnotations = [];
         $parameterAnnotations = [];
-        $annotations = $attributes['annotations'] ?? [];
+        $annotations = $annotations ?: $attributes['annotations'] ?? [];
         if (! is_array($annotations)) {
             $annotations = [$annotations];
         }

src/Annotations/SourceField.php

@@ -40,8 +40,11 @@ class SourceField implements SourceFieldInterface
     /** @var array<string, ParameterAnnotations> */
     private array $parameterAnnotations;
 
-    /** @param mixed[] $attributes */
-    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null, string|null $phpType = null, string|null $description = null, string|null $sourceName = null)
+    /**
+     * @param mixed[] $attributes
+     * @param array<MiddlewareAnnotationInterface|ParameterAnnotationInterface> $annotations
+     */
+    public function __construct(array $attributes = [], string|null $name = null, string|null $outputType = null, string|null $phpType = null, string|null $description = null, string|null $sourceName = null, array $annotations = [])
     {
         $name = $name ?? $attributes['name'] ?? null;
         if ($name === null) {
@@ -59,7 +62,7 @@ public function __construct(array $attributes = [], string|null $name = null, st
         }
         $middlewareAnnotations = [];
         $parameterAnnotations = [];
-        $annotations = $attributes['annotations'] ?? [];
+        $annotations = $annotations ?: $attributes['annotations'] ?? [];
         if (! is_array($annotations)) {
             $annotations = [$annotations];
         }

tests/Annotations/MagicFieldTest.php

@@ -29,7 +29,16 @@ public function testExceptionInConstruct3(): void
     public function testAnnotations(): void
     {
         $magicField = new MagicField(['name'=>'test', 'outputType'=>'String!', 'annotations'=>[new Logged(), new Autowire(['for'=>'foo'])]]);
+
         $this->assertNotEmpty($magicField->getMiddlewareAnnotations()->getAnnotationsByType(Logged::class));
         $this->assertNotEmpty($magicField->getParameterAnnotations()['foo']->getAnnotationsByType(Autowire::class));
     }
+
+	public function testAnnotationsFromParameter(): void
+	{
+		$magicField = new MagicField(name: 'test', outputType: 'String!', annotations: [new Logged(), new Autowire(['for'=>'foo'])]);
+
+		$this->assertNotEmpty($magicField->getMiddlewareAnnotations()->getAnnotationsByType(Logged::class));
+		$this->assertNotEmpty($magicField->getParameterAnnotations()['foo']->getAnnotationsByType(Autowire::class));
+	}
 }

tests/Annotations/SourceFieldTest.php

@@ -25,4 +25,20 @@ public function testExceptionInConstruct3(): void
         $this->expectException(BadMethodCallException::class);
         new SourceField(['name'=>'test', 'phpType'=>'string', 'outputType'=>'String!']);
     }
+
+	public function testAnnotations(): void
+	{
+		$magicField = new SourceField(['name'=>'test', 'outputType'=>'String!', 'annotations'=>[new Logged(), new Autowire(['for'=>'foo'])]]);
+
+		$this->assertNotEmpty($magicField->getMiddlewareAnnotations()->getAnnotationsByType(Logged::class));
+		$this->assertNotEmpty($magicField->getParameterAnnotations()['foo']->getAnnotationsByType(Autowire::class));
+	}
+
+	public function testAnnotationsFromParameter(): void
+	{
+		$magicField = new SourceField(name: 'test', outputType: 'String!', annotations: [new Logged(), new Autowire(['for'=>'foo'])]);
+
+		$this->assertNotEmpty($magicField->getMiddlewareAnnotations()->getAnnotationsByType(Logged::class));
+		$this->assertNotEmpty($magicField->getParameterAnnotations()['foo']->getAnnotationsByType(Autowire::class));
+	}
 }