DependencyResolver: Reduce duplicate work

staabm · web-flow · commit 200a20379327 · 2026-02-14T20:42:57.000+01:00
diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -30,13 +30,17 @@
 use PHPStan\Type\ClosureType;
 use PHPStan\Type\FileTypeMapper;
 use PHPStan\Type\Type;
+use function array_key_exists;
 use function array_merge;
 use function count;
 
 #[AutowiredService]
 final class DependencyResolver
 {
 
+	/** @var array<string, list<ClassReflection|FunctionReflection>> */
+	private array $classDependencies = [];
+
 	public function __construct(
 		private FileHelper $fileHelper,
 		private ReflectionProvider $reflectionProvider,
@@ -520,30 +524,43 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):
 	 * @param array<int, ClassReflection|FunctionReflection> $dependenciesReflections
 	 */
 	private function addClassToDependencies(string $className, array &$dependenciesReflections): void
+	{
+		if (!array_key_exists($className, $this->classDependencies)) {
+			$this->classDependencies[$className] = $this->buildClassDependencies($className);
+		}
+
+		$dependenciesReflections = array_merge($dependenciesReflections, $this->classDependencies[$className]);
+	}
+
+	/**
+	 * @return list<ClassReflection|FunctionReflection>
+	 */
+	private function buildClassDependencies(string $className): array
 	{
 		try {
 			$classReflection = $this->reflectionProvider->getClass($className);
 		} catch (ClassNotFoundException) {
-			return;
+			return [];
 		}
 
+		$dependencies = [];
 		do {
-			$dependenciesReflections[] = $classReflection;
+			$dependencies[] = $classReflection;
 
 			foreach ($classReflection->getInterfaces() as $interface) {
-				$dependenciesReflections[] = $interface;
+				$dependencies[] = $interface;
 			}
 
 			foreach ($classReflection->getTraits(true) as $trait) {
-				$dependenciesReflections[] = $trait;
+				$dependencies[] = $trait;
 			}
 
 			foreach ($classReflection->getResolvedMixinTypes() as $mixinType) {
 				foreach ($mixinType->getReferencedClasses() as $referencedClass) {
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -552,7 +569,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -561,7 +578,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -570,7 +587,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 
 				$default = $templateTag->getDefault();
@@ -581,7 +598,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -591,7 +608,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 						if (!$this->reflectionProvider->hasClass($referencedClass)) {
 							continue;
 						}
-						$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+						$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 					}
 				}
 
@@ -603,7 +620,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -612,14 +629,14 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 				foreach ($methodTag->getParameters() as $parameter) {
 					foreach ($parameter->getType()->getReferencedClasses() as $referencedClass) {
 						if (!$this->reflectionProvider->hasClass($referencedClass)) {
 							continue;
 						}
-						$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+						$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 					}
 					if ($parameter->getDefaultValue() === null) {
 						continue;
@@ -628,7 +645,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 						if (!$this->reflectionProvider->hasClass($referencedClass)) {
 							continue;
 						}
-						$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+						$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 					}
 				}
 			}
@@ -638,7 +655,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
@@ -647,19 +664,21 @@ private function addClassToDependencies(string $className, array &$dependenciesR
 					if (!$this->reflectionProvider->hasClass($referencedClass)) {
 						continue;
 					}
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);
+					$dependencies[] = $this->reflectionProvider->getClass($referencedClass);
 				}
 			}
 
 			$phpDoc = $classReflection->getResolvedPhpDoc();
 			if ($phpDoc !== null) {
 				foreach ($phpDoc->getTypeAliasImportTags() as $importTag) {
-					$dependenciesReflections[] = $this->reflectionProvider->getClass($importTag->getImportedFrom());
+					$dependencies[] = $this->reflectionProvider->getClass($importTag->getImportedFrom());
 				}
 			}
 
 			$classReflection = $classReflection->getParentClass();
 		} while ($classReflection !== null);
+
+		return $dependencies;
 	}
 
 	private function getFunctionReflection(Node\Name $nameNode, ?Scope $scope): FunctionReflection
@@ -676,12 +695,10 @@ private function extractFromParametersAcceptor(
 	): void
 	{
 		foreach ($parametersAcceptor->getParameters() as $parameter) {
-			$referencedClasses = array_merge(
-				$parameter->getNativeType()->getReferencedClasses(),
-				$parameter->getPhpDocType()->getReferencedClasses(),
-			);
-
-			foreach ($referencedClasses as $referencedClass) {
+			foreach ($parameter->getNativeType()->getReferencedClasses() as $referencedClass) {
+				$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+			}
+			foreach ($parameter->getPhpDocType()->getReferencedClasses() as $referencedClass) {
 				$this->addClassToDependencies($referencedClass, $dependenciesReflections);
 			}
 
@@ -698,11 +715,10 @@ private function extractFromParametersAcceptor(
 			}
 		}
 
-		$returnTypeReferencedClasses = array_merge(
-			$parametersAcceptor->getNativeReturnType()->getReferencedClasses(),
-			$parametersAcceptor->getPhpDocReturnType()->getReferencedClasses(),
-		);
-		foreach ($returnTypeReferencedClasses as $referencedClass) {
+		foreach ($parametersAcceptor->getNativeReturnType()->getReferencedClasses() as $referencedClass) {
+			$this->addClassToDependencies($referencedClass, $dependenciesReflections);
+		}
+		foreach ($parametersAcceptor->getPhpDocReturnType()->getReferencedClasses() as $referencedClass) {
 			$this->addClassToDependencies($referencedClass, $dependenciesReflections);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,17 @@`
`30`	`30`	`use PHPStan\Type\ClosureType;`
`31`	`31`	`use PHPStan\Type\FileTypeMapper;`
`32`	`32`	`use PHPStan\Type\Type;`
	`33`	`+use function array_key_exists;`
`33`	`34`	`use function array_merge;`
`34`	`35`	`use function count;`
`35`	`36`
`36`	`37`	`#[AutowiredService]`
`37`	`38`	`final class DependencyResolver`
`38`	`39`	`{`
`39`	`40`
	`41`	`+ /** @var array<string, list<ClassReflection\|FunctionReflection>> */`
	`42`	`+ private array $classDependencies = [];`
	`43`	`+`
`40`	`44`	`public function __construct(`
`41`	`45`	`private FileHelper $fileHelper,`
`42`	`46`	`private ReflectionProvider $reflectionProvider,`
`@@ -520,30 +524,43 @@ private function considerArrayForCallableTest(Scope $scope, Array_ $arrayNode):`
`520`	`524`	`* @param array<int, ClassReflection\|FunctionReflection> $dependenciesReflections`
`521`	`525`	`*/`
`522`	`526`	`private function addClassToDependencies(string $className, array &$dependenciesReflections): void`
	`527`	`+ {`
	`528`	`+ if (!array_key_exists($className, $this->classDependencies)) {`
	`529`	`+ $this->classDependencies[$className] = $this->buildClassDependencies($className);`
	`530`	`+ }`
	`531`	`+`
	`532`	`+ $dependenciesReflections = array_merge($dependenciesReflections, $this->classDependencies[$className]);`
	`533`	`+ }`
	`534`	`+`
	`535`	`+ /**`
	`536`	`+ * @return list<ClassReflection\|FunctionReflection>`
	`537`	`+ */`
	`538`	`+ private function buildClassDependencies(string $className): array`
`523`	`539`	`{`
`524`	`540`	`try {`
`525`	`541`	`$classReflection = $this->reflectionProvider->getClass($className);`
`526`	`542`	`} catch (ClassNotFoundException) {`
`527`		`- return;`
	`543`	`+ return [];`
`528`	`544`	`}`
`529`	`545`
	`546`	`+ $dependencies = [];`
`530`	`547`	`do {`
`531`		`- $dependenciesReflections[] = $classReflection;`
	`548`	`+ $dependencies[] = $classReflection;`
`532`	`549`
`533`	`550`	`foreach ($classReflection->getInterfaces() as $interface) {`
`534`		`- $dependenciesReflections[] = $interface;`
	`551`	`+ $dependencies[] = $interface;`
`535`	`552`	`}`
`536`	`553`
`537`	`554`	`foreach ($classReflection->getTraits(true) as $trait) {`
`538`		`- $dependenciesReflections[] = $trait;`
	`555`	`+ $dependencies[] = $trait;`
`539`	`556`	`}`
`540`	`557`
`541`	`558`	`foreach ($classReflection->getResolvedMixinTypes() as $mixinType) {`
`542`	`559`	`foreach ($mixinType->getReferencedClasses() as $referencedClass) {`
`543`	`560`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`544`	`561`	`continue;`
`545`	`562`	`}`
`546`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`563`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`547`	`564`	`}`
`548`	`565`	`}`
`549`	`566`
`@@ -552,7 +569,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`552`	`569`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`553`	`570`	`continue;`
`554`	`571`	`}`
`555`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`572`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`556`	`573`	`}`
`557`	`574`	`}`
`558`	`575`
`@@ -561,7 +578,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`561`	`578`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`562`	`579`	`continue;`
`563`	`580`	`}`
`564`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`581`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`565`	`582`	`}`
`566`	`583`	`}`
`567`	`584`
`@@ -570,7 +587,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`570`	`587`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`571`	`588`	`continue;`
`572`	`589`	`}`
`573`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`590`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`574`	`591`	`}`
`575`	`592`
`576`	`593`	`$default = $templateTag->getDefault();`
`@@ -581,7 +598,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`581`	`598`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`582`	`599`	`continue;`
`583`	`600`	`}`
`584`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`601`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`585`	`602`	`}`
`586`	`603`	`}`
`587`	`604`
`@@ -591,7 +608,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`591`	`608`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`592`	`609`	`continue;`
`593`	`610`	`}`
`594`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`611`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`595`	`612`	`}`
`596`	`613`	`}`
`597`	`614`
`@@ -603,7 +620,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`603`	`620`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`604`	`621`	`continue;`
`605`	`622`	`}`
`606`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`623`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`607`	`624`	`}`
`608`	`625`	`}`
`609`	`626`
`@@ -612,14 +629,14 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`612`	`629`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`613`	`630`	`continue;`
`614`	`631`	`}`
`615`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`632`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`616`	`633`	`}`
`617`	`634`	`foreach ($methodTag->getParameters() as $parameter) {`
`618`	`635`	`foreach ($parameter->getType()->getReferencedClasses() as $referencedClass) {`
`619`	`636`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`620`	`637`	`continue;`
`621`	`638`	`}`
`622`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`639`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`623`	`640`	`}`
`624`	`641`	`if ($parameter->getDefaultValue() === null) {`
`625`	`642`	`continue;`
`@@ -628,7 +645,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`628`	`645`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`629`	`646`	`continue;`
`630`	`647`	`}`
`631`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`648`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`632`	`649`	`}`
`633`	`650`	`}`
`634`	`651`	`}`
`@@ -638,7 +655,7 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`638`	`655`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`639`	`656`	`continue;`
`640`	`657`	`}`
`641`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`658`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`642`	`659`	`}`
`643`	`660`	`}`
`644`	`661`
`@@ -647,19 +664,21 @@ private function addClassToDependencies(string $className, array &$dependenciesR`
`647`	`664`	`if (!$this->reflectionProvider->hasClass($referencedClass)) {`
`648`	`665`	`continue;`
`649`	`666`	`}`
`650`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($referencedClass);`
	`667`	`+ $dependencies[] = $this->reflectionProvider->getClass($referencedClass);`
`651`	`668`	`}`
`652`	`669`	`}`
`653`	`670`
`654`	`671`	`$phpDoc = $classReflection->getResolvedPhpDoc();`
`655`	`672`	`if ($phpDoc !== null) {`
`656`	`673`	`foreach ($phpDoc->getTypeAliasImportTags() as $importTag) {`
`657`		`- $dependenciesReflections[] = $this->reflectionProvider->getClass($importTag->getImportedFrom());`
	`674`	`+ $dependencies[] = $this->reflectionProvider->getClass($importTag->getImportedFrom());`
`658`	`675`	`}`
`659`	`676`	`}`
`660`	`677`
`661`	`678`	`$classReflection = $classReflection->getParentClass();`
`662`	`679`	`} while ($classReflection !== null);`
	`680`	`+`
	`681`	`+ return $dependencies;`
`663`	`682`	`}`
`664`	`683`
`665`	`684`	`private function getFunctionReflection(Node\Name $nameNode, ?Scope $scope): FunctionReflection`
`@@ -676,12 +695,10 @@ private function extractFromParametersAcceptor(`
`676`	`695`	`): void`
`677`	`696`	`{`
`678`	`697`	`foreach ($parametersAcceptor->getParameters() as $parameter) {`
`679`		`- $referencedClasses = array_merge(`
`680`		`- $parameter->getNativeType()->getReferencedClasses(),`
`681`		`- $parameter->getPhpDocType()->getReferencedClasses(),`
`682`		`- );`
`683`		`-`
`684`		`- foreach ($referencedClasses as $referencedClass) {`
	`698`	`+ foreach ($parameter->getNativeType()->getReferencedClasses() as $referencedClass) {`
	`699`	`+ $this->addClassToDependencies($referencedClass, $dependenciesReflections);`
	`700`	`+ }`
	`701`	`+ foreach ($parameter->getPhpDocType()->getReferencedClasses() as $referencedClass) {`
`685`	`702`	`$this->addClassToDependencies($referencedClass, $dependenciesReflections);`
`686`	`703`	`}`
`687`	`704`
`@@ -698,11 +715,10 @@ private function extractFromParametersAcceptor(`
`698`	`715`	`}`
`699`	`716`	`}`
`700`	`717`
`701`		`- $returnTypeReferencedClasses = array_merge(`
`702`		`- $parametersAcceptor->getNativeReturnType()->getReferencedClasses(),`
`703`		`- $parametersAcceptor->getPhpDocReturnType()->getReferencedClasses(),`
`704`		`- );`
`705`		`- foreach ($returnTypeReferencedClasses as $referencedClass) {`
	`718`	`+ foreach ($parametersAcceptor->getNativeReturnType()->getReferencedClasses() as $referencedClass) {`
	`719`	`+ $this->addClassToDependencies($referencedClass, $dependenciesReflections);`
	`720`	`+ }`
	`721`	`+ foreach ($parametersAcceptor->getPhpDocReturnType()->getReferencedClasses() as $referencedClass) {`
`706`	`722`	`$this->addClassToDependencies($referencedClass, $dependenciesReflections);`
`707`	`723`	`}`
`708`	`724`	`}`