move cache into DynamicReturnTypeExtensionRegistry

Author: staabm

src/Analyser/MutatingScope.php

@@ -98,7 +98,6 @@
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\ConstantTypeHelper;
-use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\DynamicReturnTypeExtensionRegistry;
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\ExpressionTypeResolverExtensionRegistry;
@@ -193,9 +192,6 @@ class MutatingScope implements Scope, NodeCallbackInvoker
 
 	private static int $resolveClosureTypeDepth = 0;
 
-	/** @var array<string, list<DynamicFunctionReturnTypeExtension>> */
-	private static array $functionReturnTypeExtensions = [];
-
 	/**
 	 * @param int|array{min: int, max: int}|null $configPhpVersion
 	 * @param callable(Node $node, Scope $scope): void|null $nodeCallback
@@ -2504,33 +2500,18 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 
 	private function getDynamicFunctionReturnType(FuncCall $normalizedNode, FunctionReflection $functionReflection): ?Type
 	{
-		$functionName = $functionReflection->getName();
-		if (isset(self::$functionReturnTypeExtensions[$functionName])) {
-			$extensions = self::$functionReturnTypeExtensions[$functionName];
-		} else {
-			$extensions = $this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions();
-		}
-
-		$supportedFunctions = [];
-		foreach ($extensions as $dynamicFunctionReturnTypeExtension) {
-			if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
-				continue;
-			}
-
+		foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions($functionReflection) as $dynamicFunctionReturnTypeExtension) {
 			$resolvedType = $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall(
 				$functionReflection,
 				$normalizedNode,
 				$this,
 			);
 
-			$supportedFunctions[] = $dynamicFunctionReturnTypeExtension;
 			if ($resolvedType !== null) {
-				self::$functionReturnTypeExtensions[$functionName] ??= $supportedFunctions;
 				return $resolvedType;
 			}
 		}
 
-		self::$functionReturnTypeExtensions[$functionName] ??= $supportedFunctions;
 		return null;
 	}
 

src/Type/DynamicReturnTypeExtensionRegistry.php

@@ -2,6 +2,7 @@
 
 namespace PHPStan\Type;
 
+use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ReflectionProvider;
 use function array_merge;
 use function strtolower;
@@ -15,6 +16,9 @@ final class DynamicReturnTypeExtensionRegistry
 	/** @var DynamicStaticMethodReturnTypeExtension[][]|null */
 	private ?array $dynamicStaticMethodReturnTypeExtensionsByClass = null;
 
+	/** @var array<string, list<DynamicFunctionReturnTypeExtension>> */
+	private array $dynamicReturnTypeExtensionsByFunction = [];
+
 	/**
 	 * @param DynamicMethodReturnTypeExtension[] $dynamicMethodReturnTypeExtensions
 	 * @param DynamicStaticMethodReturnTypeExtension[] $dynamicStaticMethodReturnTypeExtensions
@@ -88,9 +92,23 @@ private function getDynamicExtensionsForType(array $extensions, string $classNam
 	/**
 	 * @return DynamicFunctionReturnTypeExtension[]
 	 */
-	public function getDynamicFunctionReturnTypeExtensions(): array
+	public function getDynamicFunctionReturnTypeExtensions(FunctionReflection $functionReflection): array
 	{
-		return $this->dynamicFunctionReturnTypeExtensions;
+		$functionName = $functionReflection->getName();
+		if (isset($this->dynamicReturnTypeExtensionsByFunction[$functionName])) {
+			return $this->dynamicReturnTypeExtensionsByFunction[$functionName];
+		}
+
+		$supportedFunctions = [];
+		foreach ($this->dynamicFunctionReturnTypeExtensions as $dynamicFunctionReturnTypeExtension) {
+			if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
+				continue;
+			}
+
+			$supportedFunctions[] = $dynamicFunctionReturnTypeExtension;
+		}
+
+		return $this->dynamicReturnTypeExtensionsByFunction[$functionName] ??= $supportedFunctions;
 	}
 
 }