Promoted properties should copy parameter attributes

Roave · Nov 28, 2021 · 416ac1c · 416ac1c
1 parent b10e903
commit 416ac1c
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -768,6 +768,7 @@ public function getImmediateProperties(?int $filter = null): array
                         [new Node\Stmt\PropertyProperty($parameterNameNode->name, $parameterNode->default)],
                         $parameterNode->getAttributes(),
                         $parameterNode->type,
+                        $parameterNode->attrGroups,
                     );
                     $property                         = ReflectionProperty::createFromNode(
                         $this->reflector,

diff --git a/test/unit/Fixture/Attributes.php b/test/unit/Fixture/Attributes.php
@@ -39,6 +39,14 @@ public function methodWithAttributes(
     {
 
     }
+
+    public function __construct(
+        #[Attr]
+        #[AnotherAttr]
+        private $promotedPropertyWithAttributes
+    )
+    {
+    }
 }
 
 #[Attr]

diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -872,31 +872,48 @@ public function testGetAttributesWithoutAttributes(): void
         self::assertCount(0, $attributes);
     }
 
-    public function testGetAttributesWithAttributes(): void
+    public function dataGetAttributes(): array
+    {
+        return [
+            ['propertyWithAttributes'],
+            ['promotedPropertyWithAttributes'],
+        ];
+    }
+
+    /**
+     * @dataProvider dataGetAttributes
+     */
+    public function testGetAttributesWithAttributes(string $propertyName): void
     {
         $reflector          = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/Attributes.php', $this->astLocator));
         $classReflection    = $reflector->reflectClass(ClassWithAttributes::class);
-        $propertyReflection = $classReflection->getProperty('propertyWithAttributes');
+        $propertyReflection = $classReflection->getProperty($propertyName);
         $attributes         = $propertyReflection->getAttributes();
 
         self::assertCount(2, $attributes);
     }
 
-    public function testGetAttributesByName(): void
+    /**
+     * @dataProvider dataGetAttributes
+     */
+    public function testGetAttributesByName(string $propertyName): void
     {
         $reflector          = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/Attributes.php', $this->astLocator));
         $classReflection    = $reflector->reflectClass(ClassWithAttributes::class);
-        $propertyReflection = $classReflection->getProperty('propertyWithAttributes');
+        $propertyReflection = $classReflection->getProperty($propertyName);
         $attributes         = $propertyReflection->getAttributesByName(Attr::class);
 
         self::assertCount(1, $attributes);
     }
 
-    public function testGetAttributesByInstance(): void
+    /**
+     * @dataProvider dataGetAttributes
+     */
+    public function testGetAttributesByInstance(string $propertyName): void
     {
         $reflector          = new DefaultReflector(new SingleFileSourceLocator(__DIR__ . '/../Fixture/Attributes.php', $this->astLocator));
         $classReflection    = $reflector->reflectClass(ClassWithAttributes::class);
-        $propertyReflection = $classReflection->getProperty('propertyWithAttributes');
+        $propertyReflection = $classReflection->getProperty($propertyName);
         $attributes         = $propertyReflection->getAttributesByInstance(Attr::class);
 
         self::assertCount(2, $attributes);
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,14 @@ public function methodWithAttributes( @@
         {
         }
+        public function __construct(
+            #[Attr]
+            #[AnotherAttr]
+            private $promotedPropertyWithAttributes
+        )
+        {
+        }
     }
     #[Attr]
@@ Expand Down @@