fix: return indexed list of attributes when filtering on type

CuyZ · Jan 26, 2022 · 66aa4d6 · 66aa4d6
1 parent 718d3c1
commit 66aa4d6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/Definition/AttributesContainer.php b/src/Definition/AttributesContainer.php
@@ -7,6 +7,7 @@
 use Traversable;
 
 use function array_filter;
+use function array_values;
 use function count;
 
 /** @internal */
@@ -33,10 +34,10 @@ public function has(string $className): bool
 
     public function ofType(string $className): iterable
     {
-        return array_filter(
+        return array_values(array_filter(
             $this->attributes,
             static fn (object $attribute): bool => $attribute instanceof $className
-        );
+        ));
     }
 
     public function count(): int

diff --git a/tests/Integration/Mapping/Attribute/ObjectBuilderStrategyMappingTest.php b/tests/Integration/Mapping/Attribute/ObjectBuilderStrategyMappingTest.php
@@ -41,6 +41,14 @@ public function test_repeated_object_builder_factory_attributes_throws_exception
     }
 }
 
+/**
+ * @Annotation
+ */
+#[Attribute(Attribute::TARGET_CLASS)]
+final class ForeignAttribute
+{
+}
+
 /**
  * @Annotation
  */
@@ -54,8 +62,10 @@ public function for(ClassDefinition $class, $source): ObjectBuilder
 }
 
 /**
+ * @ForeignAttribute
  * @StaticMethodConstructor("create")
  */
+#[ForeignAttribute]
 #[StaticMethodConstructor('create')]
 final class ObjectWithBuilderStrategyAttribute
 {