Adjust a bunch of places for first-class callables and nullsafe operators

ondrejmirtes · ondrejmirtes · commit e437c5ad60d3 · 2025-10-20T10:10:42.000+02:00
diff --git a/src/Dependency/DependencyResolver.php b/src/Dependency/DependencyResolver.php
@@ -14,10 +14,14 @@
 use PHPStan\DependencyInjection\AutowiredService;
 use PHPStan\File\FileHelper;
 use PHPStan\Node\ClassPropertyNode;
+use PHPStan\Node\FunctionCallableNode;
 use PHPStan\Node\InClassMethodNode;
 use PHPStan\Node\InClassNode;
 use PHPStan\Node\InFunctionNode;
 use PHPStan\Node\InPropertyHookNode;
+use PHPStan\Node\InstantiationCallableNode;
+use PHPStan\Node\MethodCallableNode;
+use PHPStan\Node\StaticMethodCallableNode;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\ExtendedParameterReflection;
 use PHPStan\Reflection\ExtendedParametersAcceptor;
@@ -470,6 +474,22 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 					}
 				}
 			}
+		} elseif ($node instanceof StaticMethodCallableNode) {
+			foreach ($this->resolveDependencies(new Node\Expr\StaticCall($node->getClass(), $node->getName()), $scope)->getReflections() as $dependency) {
+				$dependenciesReflections[] = $dependency;
+			}
+		} elseif ($node instanceof MethodCallableNode) {
+			foreach ($this->resolveDependencies(new Node\Expr\MethodCall($node->getVar(), $node->getName()), $scope)->getReflections() as $dependency) {
+				$dependenciesReflections[] = $dependency;
+			}
+		} elseif ($node instanceof FunctionCallableNode) {
+			foreach ($this->resolveDependencies(new Node\Expr\FuncCall($node->getName()), $scope)->getReflections() as $dependency) {
+				$dependenciesReflections[] = $dependency;
+			}
+		} elseif ($node instanceof InstantiationCallableNode) {
+			foreach ($this->resolveDependencies(new Node\Expr\New_($node->getClass()), $scope)->getReflections() as $dependency) {
+				$dependenciesReflections[] = $dependency;
+			}
 		}
 
 		return new NodeDependencies($this->fileHelper, $dependenciesReflections, $this->exportedNodeResolver->resolve($scope->getFile(), $node));
diff --git a/src/Dependency/NodeDependencies.php b/src/Dependency/NodeDependencies.php
@@ -21,6 +21,14 @@ public function __construct(
 	{
 	}
 
+	/**
+	 * @return array<int, ClassReflection|FunctionReflection>
+	 */
+	public function getReflections(): array
+	{
+		return $this->reflections;
+	}
+
 	/**
 	 * @param array<string, true> $analysedFiles
 	 * @return string[]
diff --git a/src/Parser/ArrayFilterArgVisitor.php b/src/Parser/ArrayFilterArgVisitor.php
@@ -16,10 +16,10 @@ final class ArrayFilterArgVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'array_filter') {
-				$args = $node->getRawArgs();
+				$args = $node->getArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/src/Parser/ArrayFindArgVisitor.php b/src/Parser/ArrayFindArgVisitor.php
@@ -17,10 +17,10 @@ final class ArrayFindArgVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 			$functionName = $node->name->toLowerString();
 			if (in_array($functionName, ['array_all', 'array_any', 'array_find', 'array_find_key'], true)) {
-				$args = $node->getRawArgs();
+				$args = $node->getArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/src/Parser/ArrayWalkArgVisitor.php b/src/Parser/ArrayWalkArgVisitor.php
@@ -16,10 +16,10 @@ final class ArrayWalkArgVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'array_walk') {
-				$args = $node->getRawArgs();
+				$args = $node->getArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/src/Parser/CurlSetOptArgVisitor.php b/src/Parser/CurlSetOptArgVisitor.php
@@ -16,7 +16,7 @@ final class CurlSetOptArgVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'curl_setopt') {
 				$args = $node->getRawArgs();
diff --git a/src/Parser/ImmediatelyInvokedClosureVisitor.php b/src/Parser/ImmediatelyInvokedClosureVisitor.php
@@ -16,7 +16,7 @@ final class ImmediatelyInvokedClosureVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure && !$node->isFirstClassCallable()) {
 			$node->name->setAttribute(self::ATTRIBUTE_NAME, true);
 		}
 
diff --git a/src/Parser/ImplodeArgVisitor.php b/src/Parser/ImplodeArgVisitor.php
@@ -17,7 +17,7 @@ final class ImplodeArgVisitor extends NodeVisitorAbstract
 	#[Override]
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 			$functionName = $node->name->toLowerString();
 			if (in_array($functionName, ['implode', 'join'], true)) {
 				$args = $node->getRawArgs();
diff --git a/src/Parser/VariadicFunctionsVisitor.php b/src/Parser/VariadicFunctionsVisitor.php
@@ -57,6 +57,7 @@ public function enterNode(Node $node): ?Node
 		if (
 			$this->inFunction !== null
 			&& $node instanceof Node\Expr\FuncCall
+			&& !$node->isFirstClassCallable()
 			&& $node->name instanceof Name
 			&& in_array((string) $node->name, ParametersAcceptor::VARIADIC_FUNCTIONS, true)
 			&& !array_key_exists($this->inFunction, $this->variadicFunctions)
diff --git a/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php b/src/Reflection/BetterReflection/SourceLocator/CachingVisitor.php
@@ -85,7 +85,7 @@ public function enterNode(Node $node): ?int
 			return NodeVisitor::DONT_TRAVERSE_CHILDREN;
 		}
 
-		if ($node instanceof Node\Expr\FuncCall) {
+		if ($node instanceof Node\Expr\FuncCall && !$node->isFirstClassCallable()) {
 			try {
 				ConstantNodeChecker::assertValidDefineFunctionCall($node);
 			} catch (InvalidConstantNode) {
diff --git a/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php b/src/Rules/Arrays/NonexistentOffsetInArrayDimFetchRule.php
@@ -112,6 +112,7 @@ public function processNode(Node $node, Scope $scope): array
 
 		if (
 			$node->dim instanceof Node\Expr\FuncCall
+			&& !$node->dim->isFirstClassCallable()
 			&& $node->dim->name instanceof Node\Name
 			&& in_array($node->dim->name->toLowerString(), ['array_key_first', 'array_key_last'], true)
 			&& count($node->dim->getArgs()) >= 1
diff --git a/src/Rules/Comparison/ConstantConditionRuleHelper.php b/src/Rules/Comparison/ConstantConditionRuleHelper.php
@@ -51,9 +51,11 @@ private function shouldSkip(Scope $scope, Expr $expr): bool
 		}
 
 		if (
-			$expr instanceof FuncCall
-			|| $expr instanceof MethodCall
-			|| $expr instanceof Expr\StaticCall
+			(
+				$expr instanceof FuncCall
+				|| $expr instanceof MethodCall
+				|| $expr instanceof Expr\StaticCall
+			) && !$expr->isFirstClassCallable()
 		) {
 			$isAlways = $this->impossibleCheckTypeHelper->findSpecifiedType($scope, $expr);
 			if ($isAlways !== null) {
diff --git a/src/Rules/DeadCode/PossiblyPureFuncCallCollector.php b/src/Rules/DeadCode/PossiblyPureFuncCallCollector.php
@@ -27,7 +27,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope)
 	{
-		if (!$node->expr instanceof Node\Expr\FuncCall) {
+		if (!$node->expr instanceof Node\Expr\FuncCall || $node->expr->isFirstClassCallable()) {
 			return null;
 		}
 		if (!$node->expr->name instanceof Node\Name) {
diff --git a/src/Rules/DeadCode/PossiblyPureMethodCallCollector.php b/src/Rules/DeadCode/PossiblyPureMethodCallCollector.php
@@ -26,7 +26,10 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope)
 	{
-		if (!$node->expr instanceof Node\Expr\MethodCall) {
+		if (!$node->expr instanceof Node\Expr\MethodCall && !$node->expr instanceof Node\Expr\NullsafeMethodCall) {
+			return null;
+		}
+		if ($node->expr->isFirstClassCallable()) {
 			return null;
 		}
 		if (!$node->expr->name instanceof Node\Identifier) {
diff --git a/src/Rules/DeadCode/PossiblyPureStaticCallCollector.php b/src/Rules/DeadCode/PossiblyPureStaticCallCollector.php
@@ -26,7 +26,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope)
 	{
-		if (!$node->expr instanceof Node\Expr\StaticCall) {
+		if (!$node->expr instanceof Node\Expr\StaticCall || $node->expr->isFirstClassCallable()) {
 			return null;
 		}
 		if (!$node->expr->name instanceof Node\Identifier) {
diff --git a/src/Rules/UnusedFunctionParametersCheck.php b/src/Rules/UnusedFunctionParametersCheck.php
@@ -73,7 +73,7 @@ private function getUsedVariables(Scope $scope, $node): array
 	{
 		$variableNames = [];
 		if ($node instanceof Node) {
-			if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
+			if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {
 				$functionName = $this->reflectionProvider->resolveFunctionName($node->name, $scope);
 				if (in_array($functionName, ['func_get_args', 'get_defined_vars'], true)) {
 					return $scope->getDefinedVariables();
@@ -87,6 +87,7 @@ private function getUsedVariables(Scope $scope, $node): array
 			}
 			if (
 				$node instanceof Node\Expr\FuncCall
+				&& !$node->isFirstClassCallable()
 				&& $node->name instanceof Node\Name
 				&& (string) $node->name === 'compact'
 			) {
diff --git a/src/Type/Regex/RegexExpressionHelper.php b/src/Type/Regex/RegexExpressionHelper.php
@@ -49,6 +49,7 @@ public function resolve(Expr $expr): Type
 				// this allows us to turn string concatenations with preg_quote() into static analyzable strings.
 				if (
 					$expr instanceof Expr\FuncCall
+					&& !$expr->isFirstClassCallable()
 					&& $expr->name instanceof Name
 					&& $expr->name->toLowerString() === 'preg_quote'
 				) {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,14 @@ public function __construct(`
`21`	`21`	`{`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ /**`
	`25`	`+ * @return array<int, ClassReflection\|FunctionReflection>`
	`26`	`+ */`
	`27`	`+ public function getReflections(): array`
	`28`	`+ {`
	`29`	`+ return $this->reflections;`
	`30`	`+ }`
	`31`	`+`
`24`	`32`	`/**`
`25`	`33`	`* @param array<string, true> $analysedFiles`
`26`	`34`	`* @return string[]`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ final class ArrayFilterArgVisitor extends NodeVisitorAbstract`
`16`	`16`	`#[Override]`
`17`	`17`	`public function enterNode(Node $node): ?Node`
`18`	`18`	`{`
`19`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`19`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`20`	`20`	`$functionName = $node->name->toLowerString();`
`21`	`21`	`if ($functionName === 'array_filter') {`
`22`		`- $args = $node->getRawArgs();`
	`22`	`+ $args = $node->getArgs();`
`23`	`23`	`if (isset($args[0])) {`
`24`	`24`	`$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@ final class ArrayFindArgVisitor extends NodeVisitorAbstract`
`17`	`17`	`#[Override]`
`18`	`18`	`public function enterNode(Node $node): ?Node`
`19`	`19`	`{`
`20`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`20`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`21`	`21`	`$functionName = $node->name->toLowerString();`
`22`	`22`	`if (in_array($functionName, ['array_all', 'array_any', 'array_find', 'array_find_key'], true)) {`
`23`		`- $args = $node->getRawArgs();`
	`23`	`+ $args = $node->getArgs();`
`24`	`24`	`if (isset($args[0])) {`
`25`	`25`	`$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ final class ArrayWalkArgVisitor extends NodeVisitorAbstract`
`16`	`16`	`#[Override]`
`17`	`17`	`public function enterNode(Node $node): ?Node`
`18`	`18`	`{`
`19`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`19`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`20`	`20`	`$functionName = $node->name->toLowerString();`
`21`	`21`	`if ($functionName === 'array_walk') {`
`22`		`- $args = $node->getRawArgs();`
	`22`	`+ $args = $node->getArgs();`
`23`	`23`	`if (isset($args[0])) {`
`24`	`24`	`$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ final class CurlSetOptArgVisitor extends NodeVisitorAbstract`
`16`	`16`	`#[Override]`
`17`	`17`	`public function enterNode(Node $node): ?Node`
`18`	`18`	`{`
`19`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`19`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`20`	`20`	`$functionName = $node->name->toLowerString();`
`21`	`21`	`if ($functionName === 'curl_setopt') {`
`22`	`22`	`$args = $node->getRawArgs();`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ final class ImmediatelyInvokedClosureVisitor extends NodeVisitorAbstract`
`16`	`16`	`#[Override]`
`17`	`17`	`public function enterNode(Node $node): ?Node`
`18`	`18`	`{`
`19`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {`
	`19`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure && !$node->isFirstClassCallable()) {`
`20`	`20`	`$node->name->setAttribute(self::ATTRIBUTE_NAME, true);`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ final class ImplodeArgVisitor extends NodeVisitorAbstract`
`17`	`17`	`#[Override]`
`18`	`18`	`public function enterNode(Node $node): ?Node`
`19`	`19`	`{`
`20`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`20`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`21`	`21`	`$functionName = $node->name->toLowerString();`
`22`	`22`	`if (in_array($functionName, ['implode', 'join'], true)) {`
`23`	`23`	`$args = $node->getRawArgs();`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function enterNode(Node $node): ?int`
`85`	`85`	`return NodeVisitor::DONT_TRAVERSE_CHILDREN;`
`86`	`86`	`}`
`87`	`87`
`88`		`- if ($node instanceof Node\Expr\FuncCall) {`
	`88`	`+ if ($node instanceof Node\Expr\FuncCall && !$node->isFirstClassCallable()) {`
`89`	`89`	`try {`
`90`	`90`	`ConstantNodeChecker::assertValidDefineFunctionCall($node);`
`91`	`91`	`} catch (InvalidConstantNode) {`