Merge pull request #883 from kukulich/promoted

Support promoted properties docblocks and attributes
Roave · Nov 28, 2021 · 99c472c · 99c472c
2 parents a37bda7 + 416ac1c
commit 99c472c
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 9 deletions.
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -766,8 +766,9 @@ public function getImmediateProperties(?int $filter = null): array
                     $propertyNode                     = new Node\Stmt\Property(
                         $parameterNode->flags,
                         [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/Fixture/ExampleClass.php b/test/unit/Fixture/ExampleClass.php
@@ -43,7 +43,7 @@ class ExampleClass
 
         public static $publicStaticProperty;
 
-        public function __construct(private ?int $promotedProperty = 123, $noPromotedProperty = null)
+        public function __construct(/** Some doccomment */ private ?int $promotedProperty = 123, $noPromotedProperty = null)
         {
         }
 

diff --git a/test/unit/Reflection/ReflectionPropertyTest.php b/test/unit/Reflection/ReflectionPropertyTest.php
@@ -255,7 +255,12 @@ public function testIsPromoted(): void
         self::assertTrue($promotedProperty->hasType());
         self::assertSame('?int', $promotedProperty->getType()->__toString());
         self::assertTrue($promotedProperty->hasDefaultValue());
-        self:self::assertSame(123, $promotedProperty->getDefaultValue());
+        self::assertSame(123, $promotedProperty->getDefaultValue());
+        self::assertSame(46, $promotedProperty->getStartLine());
+        self::assertSame(46, $promotedProperty->getEndLine());
+        self::assertSame(60, $promotedProperty->getStartColumn());
+        self::assertSame(95, $promotedProperty->getEndColumn());
+        self::assertSame('/** Some doccomment */', $promotedProperty->getDocComment());
     }
 
     public function testIsDefault(): void
@@ -867,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 @@