https://github.com/laminas/laminas-code/pull/145

Author: jakublabno

src/Generator/AttributeGenerator.php

@@ -5,50 +5,78 @@
 namespace Laminas\Code\Generator;
 
 use Laminas\Code\Generator\AttributeGenerator\AttributeAssembler;
-use Laminas\Code\Generator\AttributeGenerator\AttributeAssemblerBag;
-use Laminas\Code\Generator\AttributeGenerator\AttributeAssemblerFactory;
-use Laminas\Code\Generator\AttributeGenerator\AttributeBuilder;
+use Laminas\Code\Generator\AttributeGenerator\AttributePrototype;
+use Laminas\Code\Generator\AttributeGenerator\AttributeWithArgumentsAssembler;
+use Laminas\Code\Generator\AttributeGenerator\SimpleAttributeAssembler;
+use ReflectionAttribute;
 use ReflectionClass;
 
-class AttributeGenerator extends AbstractGenerator
+final class AttributeGenerator implements GeneratorInterface
 {
-    private function __construct(private AttributeAssemblerBag $attributeAssemblerBag)
+    private array $assemblers;
+
+    private function __construct(AttributeAssembler ...$assembler)
     {
+        $this->assemblers = $assembler;
     }
 
     public function generate(): string
     {
-        $generatedAttributes = array_map(fn(AttributeAssembler $attributeAssembler) => $attributeAssembler->__toString(),
-            $this->attributeAssemblerBag->toArray(),
+        $generatedAttributes = array_map(fn(AttributeAssembler $attributeAssembler) => $attributeAssembler->assemble(),
+            $this->assemblers,
         );
 
-        return implode(self::LINE_FEED, $generatedAttributes);
+        return implode(AbstractGenerator::LINE_FEED, $generatedAttributes);
     }
 
-    public static function fromReflection(ReflectionClass $reflectionClass): self
+    public static function fromPrototype(AttributePrototype ...$attributePrototype): self
     {
-        return new self(AttributeAssemblerFactory::createForClassByReflection($reflectionClass));
+        $assemblers = [];
+        
+        foreach ($attributePrototype as $prototype) {
+            $assemblers[] = self::negotiateAssembler($prototype);
+        }
+
+        return new self(...$assemblers);
     }
 
-    public static function fromBuilder(AttributeBuilder $attributeBuilder): self
+    public static function fromReflection(ReflectionClass $reflectionClass): self
     {
-        return new self(AttributeAssemblerFactory::createForClassFromBuilder($attributeBuilder));
+        $attributes = $reflectionClass->getAttributes();
+        $assemblers = [];
+
+        foreach ($attributes as $attribute) {
+            $assembler = self::negotiateAssembler($attribute);
+
+            $assemblers[] = $assembler;
+        }
+
+        return new self(...$assemblers);
     }
 
     public static function fromArray(array $definitions): self
     {
-        $builder = new AttributeBuilder();
+        $assemblers = [];
 
         foreach ($definitions as $definition) {
             @list($attributeName, $attributeArguments) = $definition;
 
-            if (!isset($attributeArguments)) {
-                $attributeArguments = [];
-            }
+            $prototype = new AttributePrototype($attributeName, $attributeArguments ?? []);
+
+            $assemblers[] = self::negotiateAssembler($prototype);
+        }
+
+        return new self(...$assemblers);
+    }
+
+    private static function negotiateAssembler(ReflectionAttribute|AttributePrototype $reflectionPrototype): AttributeAssembler
+    {
+        $hasArguments = !empty($reflectionPrototype->getArguments());
 
-            $builder->add($attributeName, $attributeArguments);
+        if ($hasArguments) {
+            return new AttributeWithArgumentsAssembler($reflectionPrototype);
         }
 
-        return self::fromBuilder($builder);
+        return new SimpleAttributeAssembler($reflectionPrototype);
     }
 }

src/Generator/AttributeGenerator/AttributeAssembler.php

@@ -4,8 +4,7 @@
 
 namespace Laminas\Code\Generator\AttributeGenerator;
 
-use Stringable;
-
-interface AttributeAssembler extends Stringable
+interface AttributeAssembler
 {
+    public function assemble(): string;
 }

src/Generator/AttributeGenerator/AttributeAssemblerBag.php

@@ -5,6 +5,9 @@
 namespace Laminas\Code\Generator\AttributeGenerator;
 
 //TODO Enum in PHP8.1
+/**
+ * @internal
+ */
 final class AttributePart
 {
     public const T_ATTR_START = '#[';
@@ -13,6 +16,6 @@ final class AttributePart
     public const T_ATTR_ARGUMENTS_LIST_START = '(';
     public const T_ATTR_ARGUMENTS_LIST_END = ')';
 
-    public const T_ATTR_ARGUMENTS_LIST_ASSIGN_OPERAND = ':';
+    public const T_ATTR_ARGUMENTS_LIST_ASSIGN_OPERAND = ': ';
     public const T_ATTR_ARGUMENTS_LIST_SEPARATOR = ', ';
 }

src/Generator/AttributeGenerator/AttributeAssemblerFactory.php

@@ -8,7 +8,7 @@
 
 final class AttributeWithArgumentsAssembler extends AbstractAttributeAssembler
 {
-    public function __toString(): string
+    public function assemble(): string
     {
         $attributeName = $this->getName();
 
@@ -24,7 +24,7 @@ private function generateArguments(string &$output): void
         $argumentsList = [];
 
         foreach ($this->getArguments() as $argumentName => $argumentValue) {
-            $argumentsList[] = $argumentName . ': ' . $this->formatArgumentValue($argumentValue);
+            $argumentsList[] = $argumentName . AttributePart::T_ATTR_ARGUMENTS_LIST_ASSIGN_OPERAND . $this->formatArgumentValue($argumentValue);
         }
 
         $output .= implode(AttributePart::T_ATTR_ARGUMENTS_LIST_SEPARATOR, $argumentsList);

src/Generator/AttributeGenerator/AttributeBuilder.php

@@ -16,7 +16,7 @@ public function __construct(ReflectionAttribute $attributePrototype)
         $this->assertAttributeWithoutArguments();
     }
 
-    public function __toString(): string
+    public function assemble(): string
     {
         $attributeName = $this->getName();
 

src/Generator/AttributeGenerator/AttributePart.php

@@ -214,7 +214,7 @@ public static function fromArray(array $array)
                     $cg->setDocBlock($docBlock);
                     break;
                 case 'attribute':
-                    $generator = $value instanceof AttributeBuilder ? AttributeGenerator::fromBuilder($value) : AttributeGenerator::fromArray($value);
+                    $generator = $value instanceof AttributeGenerator ? $value : AttributeGenerator::fromArray($value);
                     $cg->setAttributes($generator);
                     break;
                 case 'flags':
@@ -247,17 +247,17 @@ public static function fromArray(array $array)
      * @psalm-param array<class-string>            $interfaces
      * @param PropertyGenerator[]|string[]|array[] $properties
      * @param MethodGenerator[]|string[]|array[]   $methods
-     * @param DocBlockGenerator                    $docBlock
      */
     public function __construct(
-        $name = null,
+        string $name = null,
         $namespaceName = null,
         $flags = null,
         $extends = null,
         array $interfaces = [],
         array $properties = [],
         array $methods = [],
-        $docBlock = null
+        DocBlockGenerator $docBlock = null,
+        AttributeGenerator $attributeGenerator = null,
     ) {
         $this->traitUsageGenerator = new TraitUsageGenerator($this);
 
@@ -285,6 +285,9 @@ public function __construct(
         if ($docBlock !== null) {
             $this->setDocBlock($docBlock);
         }
+        if ($attributeGenerator) {
+            $this->setAttributes($attributeGenerator);
+        }
     }
 
     /**