Twig templates: traverse even arrays of view models (#290)

Author: janedbal

src/Provider/TwigUsageProvider.php

@@ -18,7 +18,6 @@
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ReflectionProvider;
-use PHPStan\Type\Type;
 use PHPStan\Type\UnionType;
 use ReflectionException;
 use ShipMonk\PHPStan\DeadCode\Enum\AccessType;
@@ -294,8 +293,7 @@ private function getUsagesFromTemplateReturn(
             return [];
         }
 
-        $returnType = $scope->getType($node->expr);
-        $referencedClassNames = $this->extractObjectTypes($returnType);
+        $referencedClassNames = $scope->getType($node->expr)->getReferencedClasses();
 
         $usages = [];
         $visited = [];
@@ -337,9 +335,7 @@ private function getUsagesFromRenderCall(
         }
 
         $parametersArg = $args[$parametersArgIndex];
-        $parametersType = $scope->getType($parametersArg->value);
-
-        $objectTypes = $this->extractObjectTypes($parametersType);
+        $objectTypes = $scope->getType($parametersArg->value)->getReferencedClasses();
 
         $usages = [];
         $visited = [];
@@ -457,14 +453,6 @@ private function isInControllerMethodWithTemplate(
         return false;
     }
 
-    /**
-     * @return list<string>
-     */
-    private function extractObjectTypes(Type $returnType): array
-    {
-        return $returnType->getReferencedClasses();
-    }
-
     /**
      * @param non-empty-string $context
      * @param array<string, true> $visited
@@ -533,7 +521,7 @@ private function getPublicMembersUsages(
             foreach ($variants as $variant) {
                 $returnType = $variant->getReturnType();
 
-                foreach ($returnType->getObjectClassNames() as $returnClassName) {
+                foreach ($returnType->getReferencedClasses() as $returnClassName) {
                     $usages = [
                         ...$usages,
                         ...$this->traverseClassNameRecursively(
@@ -557,7 +545,7 @@ private function getPublicMembersUsages(
             $propertyReflection = $classReflection->getNativeProperty($property->getName());
             $newContext = "{$context} -> {$shortClassName}::\${$property->getName()}";
 
-            foreach ($propertyReflection->getReadableType()->getObjectClassNames() as $propertyClassName) {
+            foreach ($propertyReflection->getReadableType()->getReferencedClasses() as $propertyClassName) {
                 $usages = [
                     ...$usages,
                     ...$this->traverseClassNameRecursively(

tests/Rule/data/providers/twig-template.php

@@ -22,7 +22,11 @@ final class TemplateNestedData
     public int $nestedProperty = 1;
 
     public function getValue(): string { return 'nested'; }
-    public function getDeep(): TemplateDeepData { return new TemplateDeepData(); }
+
+    /**
+     * @return TemplateDeepData[]
+     */
+    public function getDeep(): array { return [new TemplateDeepData()]; }
 }
 
 final class TemplateDeepData