wip

Author: zonuexe

src/Analyser/MutatingScope.php

@@ -150,6 +150,7 @@
 use function is_string;
 use function ltrim;
 use function md5;
+use function preg_match;
 use function sprintf;
 use function str_starts_with;
 use function strlen;
@@ -2224,25 +2225,45 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
 		}
 
 		if ($node instanceof FuncCall) {
-			if ($node->name instanceof Expr) {
+			$functionName = null;
+			if ($node->name instanceof Name) {
+				$functionName = $node->name;
+			} elseif ($node->name instanceof Expr) {
 				$calledOnType = $this->getType($node->name);
 				if ($calledOnType->isCallable()->no()) {
 					return new ErrorType();
 				}
 
-				return ParametersAcceptorSelector::selectFromArgs(
-					$this,
-					$node->getArgs(),
-					$calledOnType->getCallableParametersAcceptors($this),
-					null,
-				)->getReturnType();
+				if ($node->name instanceof String_) {
+					/** @var non-empty-string $name */
+					$name = $node->name->value;
+					$functionName = new Name($name);
+				} elseif ($node->name instanceof FuncCall && $node->name->isFirstClassCallable() &&
+						  $node->name->getAttribute('phpstan_cache_printer') !== null &&
+						  preg_match('/\A(?<name>\\\\?[^()]+)\(...\)\z/', $node->name->getAttribute('phpstan_cache_printer'), $m) === 1
+				) {
+					/** @var non-falsy-string $name */
+					$name = $m['name'];
+					$functionName = new Name($name);
+				} else {
+					return ParametersAcceptorSelector::selectFromArgs(
+						$this,
+						$node->getArgs(),
+						$calledOnType->getCallableParametersAcceptors($this),
+						null,
+					)->getReturnType();
+				}
+			}
+
+			if ($functionName === null) {
+				throw new ShouldNotHappenException();
 			}
 
-			if (!$this->reflectionProvider->hasFunction($node->name, $this)) {
+			if (!$this->reflectionProvider->hasFunction($functionName, $this)) {
 				return new ErrorType();
 			}
 
-			$functionReflection = $this->reflectionProvider->getFunction($node->name, $this);
+			$functionReflection = $this->reflectionProvider->getFunction($functionName, $this);
 			if ($this->nativeTypesPromoted) {
 				return ParametersAcceptorSelector::combineAcceptors($functionReflection->getVariants())->getNativeReturnType();
 			}

src/Type/Php/ArrayMapFunctionReturnTypeExtension.php

@@ -23,7 +23,6 @@
 use PHPStan\Type\TypeUtils;
 use function array_slice;
 use function count;
-use function preg_match;
 
 final class ArrayMapFunctionReturnTypeExtension implements DynamicFunctionReturnTypeExtension
 {
@@ -51,18 +50,6 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			}
 			$valueType = TypeCombinator::union(...$valueTypes);
 			$callback = $functionCall->getArgs()[0]->value;
-			if ($callback instanceof String_) {
-				/** @var non-falsy-string $callName */
-				$callName = $callback->value;
-				$callback = new Name($callName);
-			} elseif ($callback instanceof FuncCall && $callback->isFirstClassCallable() &&
-				$callback->getAttribute('phpstan_cache_printer') !== null &&
-				preg_match('/\A(?<name>\\\\?[^()]+)\(...\)\z/', $callback->getAttribute('phpstan_cache_printer'), $m) === 1
-			) {
-				/** @var non-falsy-string $callName */
-				$callName = $m['name'];
-				$callback = new Name($callName);
-			}
 		} elseif ($callableIsNull) {
 			$arrayBuilder = ConstantArrayTypeBuilder::createEmpty();
 			foreach (array_slice($functionCall->getArgs(), 1) as $index => $arg) {