Simplify

Author: VincentLanglet

src/Analyser/MutatingScope.php

@@ -2329,36 +2329,44 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 		}
 
 		if ($node instanceof FuncCall) {
-			$functionName = null;
-			if ($node->name instanceof Name) {
-				$functionName = $node->name;
-			} elseif ($node->name instanceof Expr) {
+			if ($node->name instanceof Expr) {
 				$calledOnType = $this->getType($node->name);
 				if ($calledOnType->isCallable()->no()) {
 					return new ErrorType();
 				}
 
+				$parametersAcceptor = ParametersAcceptorSelector::selectFromArgs(
+					$this,
+					$node->getArgs(),
+					$calledOnType->getCallableParametersAcceptors($this),
+					null,
+				);
+
+				$functionName = null;
 				if ($node->name instanceof String_) {
 					/** @var non-empty-string $name */
 					$name = $node->name->value;
 					$functionName = new Name($name);
-				} elseif ($node->name instanceof FuncCall) {
+				} elseif ($node->name instanceof FuncCall && $node->name->name instanceof Name) {
 					$functionName = $node->name->name;
-				} else {
-					return ParametersAcceptorSelector::selectFromArgs(
-						$this,
-						$node->getArgs(),
-						$calledOnType->getCallableParametersAcceptors($this),
-						null,
-					)->getReturnType();
 				}
+
+				if ($functionName !== null && $this->reflectionProvider->hasFunction($functionName, $this)) {
+					$functionReflection = $this->reflectionProvider->getFunction($functionName, $this);
+					$resolvedType = $this->getDynamicFunctionReturnType($parametersAcceptor, $node, $functionReflection);
+					if ($resolvedType !== null) {
+						return $resolvedType;
+					}
+				}
+
+				return $parametersAcceptor->getReturnType();
 			}
 
-			if (!$this->reflectionProvider->hasFunction($functionName, $this)) {
+			if (!$this->reflectionProvider->hasFunction($node->name, $this)) {
 				return new ErrorType();
 			}
 
-			$functionReflection = $this->reflectionProvider->getFunction($functionName, $this);
+			$functionReflection = $this->reflectionProvider->getFunction($node->name, $this);
 			if ($this->nativeTypesPromoted) {
 				return ParametersAcceptorSelector::combineAcceptors($functionReflection->getVariants())->getNativeReturnType();
 			}
@@ -2380,19 +2388,9 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 			);
 			$normalizedNode = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $node);
 			if ($normalizedNode !== null) {
-				foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions() as $dynamicFunctionReturnTypeExtension) {
-					if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
-						continue;
-					}
-
-					$resolvedType = $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall(
-						$functionReflection,
-						$normalizedNode,
-						$this,
-					);
-					if ($resolvedType !== null) {
-						return $resolvedType;
-					}
+				$resolvedType = $this->getDynamicFunctionReturnType($parametersAcceptor, $normalizedNode, $functionReflection);
+				if ($resolvedType !== null) {
+					return $resolvedType;
 				}
 			}
 
@@ -2402,6 +2400,29 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 		return new MixedType();
 	}
 
+	private function getDynamicFunctionReturnType(ParametersAcceptor $parametersAcceptor, FuncCall $node, FunctionReflection $functionReflection): ?Type
+	{
+		$normalizedNode = ArgumentsNormalizer::reorderFuncArguments($parametersAcceptor, $node);
+		if ($normalizedNode !== null) {
+			foreach ($this->dynamicReturnTypeExtensionRegistry->getDynamicFunctionReturnTypeExtensions() as $dynamicFunctionReturnTypeExtension) {
+				if (!$dynamicFunctionReturnTypeExtension->isFunctionSupported($functionReflection)) {
+					continue;
+				}
+
+				$resolvedType = $dynamicFunctionReturnTypeExtension->getTypeFromFunctionCall(
+					$functionReflection,
+					$node,
+					$this,
+				);
+				if ($resolvedType !== null) {
+					return $resolvedType;
+				}
+			}
+		}
+
+		return null;
+	}
+
 	private function getNullsafeShortCircuitingType(Expr $expr, Type $type): Type
 	{
 		if ($expr instanceof Expr\NullsafePropertyFetch || $expr instanceof Expr\NullsafeMethodCall) {