Merge pull request #1487 from ondrejmirtes/trait-interface-property

Fixed property from interface implemented by trait
Roave · Feb 12, 2025 · d5fa8e1 · d5fa8e1
2 parents 683b41e + 8f5e710
commit d5fa8e1
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 4 deletions.
diff --git a/src/Reflection/ReflectionClass.php b/src/Reflection/ReflectionClass.php
@@ -1024,10 +1024,9 @@ private function getPropertiesConsideringAlreadyVisitedClasses(AlreadyVisitedCla
             foreach ($trait->getPropertiesConsideringAlreadyVisitedClasses($alreadyVisitedClasses) as $traitProperty) {
                 $traitPropertyName = $traitProperty->getName();
 
-                if (
-                    array_key_exists($traitPropertyName, $properties)
-                    || array_key_exists($traitPropertyName, $immediateProperties)
-                ) {
+                $existingProperty = $immediateProperties[$traitPropertyName] ?? $properties[$traitPropertyName] ?? null;
+
+                if ($existingProperty !== null && ! $existingProperty->isAbstract()) {
                     continue;
                 }
 

diff --git a/test/unit/Reflection/ReflectionClassTest.php b/test/unit/Reflection/ReflectionClassTest.php
@@ -3169,4 +3169,46 @@ protected function hello(int $i): void
         self::assertTrue($hello->isProtected());
         self::assertCount(1, $hello->getParameters());
     }
+
+    public function testInterfacePropertyImplementedInTrait(): void
+    {
+        $php = <<<'PHP'
+<?php
+
+interface TimestampsInterface
+{
+    public \DateTimeImmutable $createdAt { get; }
+}
+
+trait Timestamps
+{
+    public private(set) \DateTimeImmutable $createdAt {
+        get {
+            return $this->createdAt ??= new \DateTimeImmutable();
+        }
+    }
+}
+
+class Example implements TimestampsInterface
+{
+    use Timestamps;
+}
+PHP;
+
+        $classInfo = (new DefaultReflector(new StringSourceLocator($php, $this->astLocator)))->reflectClass('Example');
+
+        self::assertTrue($classInfo->hasProperty('createdAt'));
+
+        /** @var trait-string $traitClassName */
+        $traitClassName = 'Timestamps';
+        /** @var class-string $className */
+        $className = 'Example';
+
+        $propertyInfo = $classInfo->getProperty('createdAt');
+        self::assertSame($traitClassName, $propertyInfo->getDeclaringClass()->getName());
+        self::assertSame($className, $propertyInfo->getImplementingClass()->getName());
+        self::assertFalse($propertyInfo->isVirtual());
+        self::assertTrue($propertyInfo->isPublic());
+        self::assertTrue($propertyInfo->isPrivateSet());
+    }
 }