Support FromReflection*() on sub-attributes (#14)

* Support reflection on sub-attributes on properties.

* Minor refactor.

* Expand subattribute reflection to all component types.

* Optimize imports.

Author: Crell

src/ReflectionDefinitionBuilder.php

@@ -130,10 +130,7 @@ public function loadSubAttributes(?object $attribute, \Reflector $reflection): v
                 if ($this->isMultivalueAttribute($type)) {
                     $subs = $this->parser->getInheritedAttributes($reflection, $type);
                     foreach ($subs as $sub) {
-                        if ($sub instanceof Finalizable) {
-                            $sub->finalize();
-                        }
-                        $this->loadSubAttributes($sub, $reflection);
+                        $this->applySubattributeFeatures($sub, $reflection);
                     }
                     if ($callback instanceof \Closure) {
                         $callback($subs);
@@ -142,10 +139,9 @@ public function loadSubAttributes(?object $attribute, \Reflector $reflection): v
                     }
                 } else {
                     $sub = $this->parser->getInheritedAttribute($reflection, $type);
-                    if ($sub instanceof Finalizable) {
-                        $sub->finalize();
+                    if ($sub) {
+                        $this->applySubattributeFeatures($sub, $reflection);
                     }
-                    $this->loadSubAttributes($sub, $reflection);
                     if ($callback instanceof \Closure) {
                         $callback($sub);
                     } else {
@@ -156,6 +152,39 @@ public function loadSubAttributes(?object $attribute, \Reflector $reflection): v
         }
     }
 
+    protected function applySubattributeFeatures(object $attribute, \Reflector $reflection): void
+    {
+        // For each possible type, check for a FromReflection interface.
+        if ($reflection instanceof \ReflectionClass && ! $reflection instanceof \ReflectionEnum && $attribute instanceof FromReflectionClass) {
+            /** @var \ReflectionClass<object> $reflection */
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionEnum && $attribute instanceof FromReflectionEnum) {
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionFunction && $attribute instanceof FromReflectionFunction) {
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionProperty && $attribute instanceof FromReflectionProperty) {
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionMethod && $attribute instanceof FromReflectionMethod) {
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionClassConstant && $attribute instanceof FromReflectionClassConstant) {
+            $attribute->fromReflection($reflection);
+        }
+        if ($reflection instanceof \ReflectionParameter && $attribute instanceof FromReflectionParameter) {
+            $attribute->fromReflection($reflection);
+        }
+
+        if ($attribute instanceof Finalizable) {
+            $attribute->finalize();
+        }
+        // Call recursively to allow sub-attributes on sub-attributes. (Yo Dawg.)
+        $this->loadSubAttributes($attribute, $reflection);
+    }
+
     /**
      * Determines if a given attribute class allows repeating.
      *

tests/Attributes/ClassWithOwnSubAttributes.php

@@ -6,7 +6,6 @@
 
 use Attribute;
 use Crell\AttributeUtils\HasSubAttributes;
-use Crell\AttributeUtils\ParseProperties;
 
 #[Attribute(Attribute::TARGET_CLASS)]
 class ClassWithOwnSubAttributes implements HasSubAttributes

tests/Attributes/ClassWithPropertiesWithSubAttributes.php

@@ -31,7 +31,7 @@ public function includePropertiesByDefault(): bool
 
     public function propertyAttribute(): string
     {
-        return PropertyWithSubAttributes::class;
+        return ConfigurablePropertyWithSubAttributes::class;
     }
 
     public function subAttributes(): array

tests/Attributes/ClassWithSubSubAttributeLevelOne.php

@@ -4,8 +4,9 @@
 
 namespace Crell\AttributeUtils\Attributes;
 
-use \Attribute;
+use Attribute;
 use Crell\AttributeUtils\HasSubAttributes;
+
 use function Crell\fp\amap;
 use function Crell\fp\prop;
 

tests/Attributes/ClassWithSubSubAttributeLevelTwo.php

@@ -5,7 +5,6 @@
 namespace Crell\AttributeUtils\Attributes;
 
 use Attribute;
-use Crell\AttributeUtils\HasSubAttributes;
 
 #[Attribute(Attribute::TARGET_CLASS)]
 class ClassWithSubSubAttributeLevelTwo

tests/Attributes/ClassWithSubSubAttributeLevelTwoMulti.php

@@ -5,7 +5,6 @@
 namespace Crell\AttributeUtils\Attributes;
 
 use Attribute;
-use Crell\AttributeUtils\HasSubAttributes;
 use Crell\AttributeUtils\Multivalue;
 
 #[Attribute(Attribute::TARGET_CLASS | Attribute::IS_REPEATABLE)]

tests/Attributes/ClassWithSubSubAttributes.php

@@ -4,7 +4,7 @@
 
 namespace Crell\AttributeUtils\Attributes;
 
-use \Attribute;
+use Attribute;
 use Crell\AttributeUtils\HasSubAttributes;
 
 #[Attribute(Attribute::TARGET_CLASS)]

tests/Attributes/ConfigurableClassWithProperties.php

@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Crell\AttributeUtils\Attributes;
+
+use Attribute;
+use Crell\AttributeUtils\ParseProperties;
+
+#[Attribute(Attribute::TARGET_CLASS)]
+class ConfigurableClassWithProperties implements ParseProperties
+{
+    /**
+     * @var array<string, ?object>
+     */
+    public array $properties = [];
+
+    public function __construct(
+        public string $propertyAttribute,
+        public bool $includeByDefault = false,
+        public string $a = 'A',
+    ) {}
+
+    public function setProperties(array $properties): void
+    {
+        $this->properties = $properties;
+    }
+
+    public function includePropertiesByDefault(): bool
+    {
+        return $this->includeByDefault;
+    }
+
+    public function propertyAttribute(): string
+    {
+        return $this->propertyAttribute;
+    }
+}

tests/Attributes/ConfigurablePropertyWithSubAttributes.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Crell\AttributeUtils\Attributes;
+
+use Attribute;
+use Crell\AttributeUtils\HasSubAttributes;
+
+#[Attribute(Attribute::TARGET_PROPERTY)]
+class ConfigurablePropertyWithSubAttributes implements HasSubAttributes
+{
+    public ?object $subattrib;
+
+    public function __construct(
+        public string $subattribute = PropertySubAttribute::class,
+        public string $a = 'A',
+    ) {}
+
+    public function subAttributes(): array
+    {
+        return [$this->subattribute => 'fromSubAttribute'];
+    }
+
+    public function fromSubAttribute(?object $sub): void
+    {
+        $sub ??= new ($this->subattribute)();
+        $this->subattrib = $sub;
+    }
+}

tests/Attributes/PropertySubAttributeWithReflection.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Crell\AttributeUtils\Attributes;
+
+use Crell\AttributeUtils\FromReflectionProperty;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class PropertySubAttributeWithReflection implements FromReflectionProperty
+{
+    public string $name;
+
+    public function fromReflection(\ReflectionProperty $subject): void
+    {
+        $this->name = $subject->getName();
+    }
+}