Use AttributeCollection instead of arrays

src/Factory/ActivityStub.php

@@ -9,6 +9,7 @@
 use Temporal\Internal\Workflow\ActivityProxy;
 use Temporal\Sugar\Attribute\RetryPolicy;
 use Temporal\Sugar\Attribute\TaskQueue;
+use Temporal\Sugar\Internal\Attribute\AttributeCollection;
 use Temporal\Sugar\Internal\Attribute\AttributeForActivity;
 use Temporal\Sugar\Internal\Attribute\AttributeReader;
 use Temporal\Sugar\Internal\RetryOptions;
@@ -82,12 +83,12 @@ public static function activity(
             retryMaxInterval: $retryMaxInterval,
             retryBackoff: $retryBackoff,
             nonRetryables: $nonRetryables,
-            attribute: $attributes[RetryPolicy::class] ?? null,
+            attribute: $attributes->first(RetryPolicy::class),
         );
 
         $options = ActivityOptions::new()->withRetryOptions($retryOptions);
 
-        $taskQueue ??= isset($attributes[TaskQueue::class][0]) ? $attributes[TaskQueue::class][0]->name : null;
+        $taskQueue ??= $attributes->first(TaskQueue::class)?->name;
         $taskQueue === null or $options = $options->withTaskQueue($taskQueue);
         // Timeouts
         $scheduleToStartTimeout === 0 or $options = $options->withScheduleToStartTimeout($scheduleToStartTimeout);
@@ -102,11 +103,10 @@ public static function activity(
     }
 
     /**
-     * @param class-string $class
-     * @return array<class-string<AttributeForActivity>, AttributeForActivity>
+     * @param class-string $class Activity class name.
      */
-    private static function readAttributes(string $class): array
+    private static function readAttributes(string $class): AttributeCollection
     {
-        return AttributeReader::fromClass($class, [AttributeForActivity::class]);
+        return AttributeReader::collectionFromClass($class, [AttributeForActivity::class]);
     }
 }

src/Factory/WorkflowStub.php

@@ -11,6 +11,8 @@
 use Temporal\Internal\Client\WorkflowProxy;
 use Temporal\Internal\Workflow\ChildWorkflowProxy;
 use Temporal\Sugar\Attribute\RetryPolicy;
+use Temporal\Sugar\Attribute\TaskQueue;
+use Temporal\Sugar\Internal\Attribute\AttributeCollection;
 use Temporal\Sugar\Internal\Attribute\AttributeForWorkflow;
 use Temporal\Sugar\Internal\Attribute\AttributeReader;
 use Temporal\Sugar\Internal\RetryOptions;
@@ -102,11 +104,11 @@ public static function workflow(
             retryMaxInterval: $retryMaxInterval,
             retryBackoff: $retryBackoff,
             nonRetryables: $nonRetryables,
-            attribute: $attributes[RetryPolicy::class] ?? null,
+            attribute: $attributes->first(RetryPolicy::class),
         );
 
         $options = WorkflowOptions::new()->withRetryOptions($retryOptions);
-        $taskQueue === null or $options = $options->withTaskQueue($taskQueue);
+        $taskQueue ??= $attributes->first(TaskQueue::class)?->name;
         // Start options
         $startDelay === 0 or $options = $options->withWorkflowStartDelay($startDelay);
         $eagerStart and $options = $options->withEagerStart(true);
@@ -201,10 +203,12 @@ public static function childWorkflow(
             $retryMaxInterval,
             $retryBackoff,
             $nonRetryables,
+            attribute: $attributes->first(RetryPolicy::class),
         );
 
         $options = Workflow\ChildWorkflowOptions::new()->withRetryOptions($retryOptions);
 
+        $taskQueue ??= $attributes->first(TaskQueue::class)?->name;
         $taskQueue === null or $options = $options->withTaskQueue($taskQueue);
         $namespace === null or $options = $options->withNamespace($namespace);
         // Start and close options
@@ -230,11 +234,10 @@ public static function childWorkflow(
     }
 
     /**
-     * @param class-string $class
-     * @return array<class-string<AttributeForWorkflow>, AttributeForWorkflow>
+     * @param class-string $class Workflow class name.
      */
-    private static function readAttributes(string $class): array
+    private static function readAttributes(string $class): AttributeCollection
     {
-        return AttributeReader::fromClass($class, [AttributeForWorkflow::class]);
+        return AttributeReader::collectionFromClass($class, [AttributeForWorkflow::class]);
     }
 }

src/Internal/Attribute/AttributeReader.php

@@ -9,13 +9,27 @@
  */
 final class AttributeReader
 {
+    /**
+     * @param class-string $class
+     * @param list<class-string> $attributes
+     */
+    public static function collectionFromClass(
+        string $class,
+        array $attributes,
+        bool $merge = true,
+        bool $inheritance = true,
+        bool $interfaces = true,
+    ): AttributeCollection {
+        return new AttributeCollection(self::arrayFromClass($class, $attributes, $merge, $inheritance, $interfaces));
+    }
+
     /**
      * @param class-string $class
      * @param list<class-string> $attributes
      *
      * @return array<class-string, list<object>>
      */
-    public static function fromClass(
+    public static function arrayFromClass(
         string $class,
         array $attributes,
         bool $merge = true,
@@ -34,7 +48,7 @@ public static function fromClass(
         }
 
         if ($parent = $reflection->getParentClass()) {
-            $attrs = self::fromClass($parent->getName(), $attributes, $merge, true, false);
+            $attrs = self::arrayFromClass($parent->getName(), $attributes, $merge, true, false);
             $result = $merge
                 ? \array_merge_recursive($result, $attrs)
                 : $result + $attrs;
@@ -45,7 +59,7 @@ public static function fromClass(
         }
 
         foreach (self::sortInterfaces($reflection) as $interface) {
-            $attrs = self::fromClass($interface, $attributes, $merge, false, false);
+            $attrs = self::arrayFromClass($interface, $attributes, $merge, false, false);
             $result = $merge
                 ? \array_merge_recursive($result, $attrs)
                 : $result + $attrs;

tests/Unit/Internal/AttributeReaderTest.php

@@ -12,7 +12,7 @@ class AttributeReaderTest extends TestCase
 {
     public function testFromClass(): void
     {
-        $result = AttributeReader::fromClass(
+        $result = AttributeReader::arrayFromClass(
             Stub\Attributed\SimpleClass::class,
             [TaskQueue::class]
         );
@@ -26,7 +26,7 @@ public function testFromClass(): void
 
     public function testFromExtendedClassWithInheritanceWithMerge(): void
     {
-        $result = AttributeReader::fromClass(
+        $result = AttributeReader::arrayFromClass(
             Stub\Attributed\ExtendedAttributed::class,
             [TaskQueue::class],
             merge: true,
@@ -47,7 +47,7 @@ public function testFromExtendedClassWithInheritanceWithMerge(): void
 
     public function testFromInterfaceWithInheritance(): void
     {
-        $result = AttributeReader::fromClass(
+        $result = AttributeReader::arrayFromClass(
             Stub\Attributed\InterfaceAttributed::class,
             [TaskQueue::class],
             merge: true,