[PropertyInfo] PhpStan extractor nested object fix

Rokas Mikalkėnas · Rokas Mikalkėnas · commit 1b11e78183f7 · 2021-12-15T12:40:59.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php b/src/Symfony/Component/PropertyInfo/PhpStan/NameScopeFactory.php
@@ -22,21 +22,36 @@ final class NameScopeFactory
 {
     public function create(string $fullClassName): NameScope
     {
+        $reflection = new \ReflectionClass($fullClassName);
         $path = explode('\\', $fullClassName);
         $className = array_pop($path);
-        [$namespace, $uses] = $this->extractFromFullClassName($fullClassName);
+        [$namespace, $uses] = $this->extractFromFullClassName($reflection);
 
-        foreach (class_uses($fullClassName) as $traitFullClassName) {
-            [, $traitUses] = $this->extractFromFullClassName($traitFullClassName);
-            $uses = array_merge($uses, $traitUses);
-        }
+        $uses = array_merge($uses, $this->collectUses($reflection));
 
         return new NameScope($className, $namespace, $uses);
     }
 
-    private function extractFromFullClassName(string $fullClassName): array
+    private function collectUses(\ReflectionClass $reflection): array
+    {
+        [, $classUses] = $this->extractFromFullClassName($reflection);
+        $uses = [$classUses];
+
+        foreach (class_uses($reflection->name) as $traitFullClassName) {
+            [, $traitUses] = $this->extractFromFullClassName(new \ReflectionClass($traitFullClassName));
+            $uses[] = $traitUses;
+        }
+
+        $parentClass = $reflection->getParentClass();
+        if (false !== $parentClass) {
+            $uses[] = $this->collectUses($parentClass);
+        }
+
+        return $uses ? array_merge(...$uses) : [];
+    }
+
+    private function extractFromFullClassName(\ReflectionClass $reflection): array
     {
-        $reflection = new \ReflectionClass($fullClassName);
         $namespace = trim($reflection->getNamespaceName(), '\\');
         $fileName = $reflection->getFileName();
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/PhpStanExtractorTest.php
@@ -116,6 +116,8 @@ public function typesProvider()
             ['arrayOfMixed', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_STRING), null)]],
             ['listOfStrings', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],
             ['self', [new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)]],
+            ['rootDummyItems', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem'))]],
+            ['rootDummyItem', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem')]],
         ];
     }
 
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -78,6 +78,8 @@ public function testGetProperties()
                 'files',
                 'propertyTypeStatic',
                 'parentAnnotationNoParent',
+                'rootDummyItems',
+                'rootDummyItem',
                 'a',
                 'DOB',
                 'Id',
@@ -138,6 +140,8 @@ public function testGetPropertiesWithCustomPrefixes()
                 'files',
                 'propertyTypeStatic',
                 'parentAnnotationNoParent',
+                'rootDummyItems',
+                'rootDummyItem',
                 'date',
                 'c',
                 'ct',
@@ -187,6 +191,8 @@ public function testGetPropertiesWithNoPrefixes()
                 'files',
                 'propertyTypeStatic',
                 'parentAnnotationNoParent',
+                'rootDummyItems',
+                'rootDummyItem',
             ],
             $noPrefixExtractor->getProperties('Symfony\Component\PropertyInfo\Tests\Fixtures\Dummy')
         );
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/ParentDummy.php
@@ -11,6 +11,8 @@
 
 namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
 
+use Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem;
+
 /**
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
@@ -58,6 +60,16 @@ class ParentDummy
      */
     public $parentAnnotationNoParent;
 
+    /**
+     * @var RootDummyItem[]
+     */
+    public $rootDummyItems;
+
+    /**
+     * @var \Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem
+     */
+    public $rootDummyItem;
+
     /**
      * @return bool|null
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/RootDummy/RootDummyItem.php
@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy;
+
+class RootDummyItem
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,8 @@ public function typesProvider()`
`116`	`116`	`['arrayOfMixed', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_STRING), null)]],`
`117`	`117`	`['listOfStrings', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_STRING))]],`
`118`	`118`	`['self', [new Type(Type::BUILTIN_TYPE_OBJECT, false, Dummy::class)]],`
	`119`	`+ ['rootDummyItems', [new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem'))]],`
	`120`	`+ ['rootDummyItem', [new Type(Type::BUILTIN_TYPE_OBJECT, false, 'Symfony\Component\PropertyInfo\Tests\Fixtures\RootDummy\RootDummyItem')]],`
`119`	`121`	`];`
`120`	`122`	`}`
`121`	`123`