[PropertyInfo] Fix PHPStan properties type in trait

mtarld · mtarld · commit c628b737c704 · 2024-04-19T17:49:05.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php b/src/Symfony/Component/PropertyInfo/Extractor/PhpStanExtractor.php
@@ -233,6 +233,14 @@ private function getDocBlockFromProperty(string $class, string $property): ?arra
             return null;
         }
 
+        $reflector = $reflectionProperty->getDeclaringClass();
+
+        foreach ($reflector->getTraits() as $trait) {
+            if ($trait->hasProperty($property)) {
+                return $this->getDocBlockFromProperty($trait->getName(), $property);
+            }
+        }
+
         if (null === $rawDocNode = $reflectionProperty->getDocComment() ?: null) {
             return null;
         }
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -19,6 +19,7 @@
 use Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\ParentDummy;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem;
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace\DummyInAnotherNamespace;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsedInTrait;
 use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\DummyUsingTrait;
 use Symfony\Component\PropertyInfo\Type;
@@ -311,6 +312,7 @@ public static function propertiesDefinedByTraitsProvider(): array
             ['propertyInTraitPrimitiveType', new Type(Type::BUILTIN_TYPE_STRING)],
             ['propertyInTraitObjectSameNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyUsedInTrait::class)],
             ['propertyInTraitObjectDifferentNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)],
+            ['dummyInAnotherNamespace', new Type(Type::BUILTIN_TYPE_OBJECT, false, DummyInAnotherNamespace::class)],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyInAnotherNamespace.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyInAnotherNamespace.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace;
+
+class DummyInAnotherNamespace
+{
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyTraitInAnotherNamespace.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/AnotherNamespace/DummyTraitInAnotherNamespace.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace;
+
+trait DummyTraitInAnotherNamespace
+{
+    /**
+     * @var DummyInAnotherNamespace
+     */
+    public $dummyInAnotherNamespace;
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/TraitUsage/DummyUsingTrait.php
@@ -11,7 +11,10 @@
 
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage;
 
+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace\DummyTraitInAnotherNamespace;
+
 class DummyUsingTrait
 {
     use DummyTrait;
+    use DummyTraitInAnotherNamespace;
 }

Original file line number	Diff line number	Diff line change
`@@ -233,6 +233,14 @@ private function getDocBlockFromProperty(string $class, string $property): ?arra`
`233`	`233`	`return null;`
`234`	`234`	`}`
`235`	`235`
	`236`	`+ $reflector = $reflectionProperty->getDeclaringClass();`
	`237`	`+`
	`238`	`+ foreach ($reflector->getTraits() as $trait) {`
	`239`	`+ if ($trait->hasProperty($property)) {`
	`240`	`+ return $this->getDocBlockFromProperty($trait->getName(), $property);`
	`241`	`+ }`
	`242`	`+ }`
	`243`	`+`
`236`	`244`	`if (null === $rawDocNode = $reflectionProperty->getDocComment() ?: null) {`
`237`	`245`	`return null;`
`238`	`246`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +<?php
++
 +namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace;
++
 +class DummyInAnotherNamespace
 +{
 +}
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,10 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage;`
`13`	`13`
	`14`	`+use Symfony\Component\PropertyInfo\Tests\Fixtures\TraitUsage\AnotherNamespace\DummyTraitInAnotherNamespace;`
	`15`	`+`
`14`	`16`	`class DummyUsingTrait`
`15`	`17`	`{`
`16`	`18`	`use DummyTrait;`
	`19`	`+ use DummyTraitInAnotherNamespace;`
`17`	`20`	`}`