Guards against first class callables

ondrejmirtes · ondrejmirtes · commit 8191828ea17b · 2026-03-08T22:44:30.000+01:00
diff --git a/src/Analyser/ExprHandler/FuncCallHandler.php b/src/Analyser/ExprHandler/FuncCallHandler.php
@@ -86,7 +86,7 @@ public function __construct(
 
 	public function supports(Expr $expr): bool
 	{
-		return $expr instanceof FuncCall;
+		return $expr instanceof FuncCall && !$expr->isFirstClassCallable();
 	}
 
 	public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult
diff --git a/src/Analyser/ExprHandler/MethodCallHandler.php b/src/Analyser/ExprHandler/MethodCallHandler.php
@@ -59,7 +59,7 @@ public function __construct(
 
 	public function supports(Expr $expr): bool
 	{
-		return $expr instanceof MethodCall;
+		return $expr instanceof MethodCall && !$expr->isFirstClassCallable();
 	}
 
 	public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult
diff --git a/src/Analyser/ExprHandler/NewHandler.php b/src/Analyser/ExprHandler/NewHandler.php
@@ -54,7 +54,7 @@ public function __construct(
 
 	public function supports(Expr $expr): bool
 	{
-		return $expr instanceof New_;
+		return $expr instanceof New_ && !$expr->isFirstClassCallable();
 	}
 
 	public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult
diff --git a/src/Analyser/ExprHandler/StaticCallHandler.php b/src/Analyser/ExprHandler/StaticCallHandler.php
@@ -56,7 +56,7 @@ public function __construct(
 
 	public function supports(Expr $expr): bool
 	{
-		return $expr instanceof StaticCall;
+		return $expr instanceof StaticCall && !$expr->isFirstClassCallable();
 	}
 
 	public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function __construct(`
`86`	`86`
`87`	`87`	`public function supports(Expr $expr): bool`
`88`	`88`	`{`
`89`		`- return $expr instanceof FuncCall;`
	`89`	`+ return $expr instanceof FuncCall && !$expr->isFirstClassCallable();`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public function __construct(`
`59`	`59`
`60`	`60`	`public function supports(Expr $expr): bool`
`61`	`61`	`{`
`62`		`- return $expr instanceof MethodCall;`
	`62`	`+ return $expr instanceof MethodCall && !$expr->isFirstClassCallable();`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function __construct(`
`54`	`54`
`55`	`55`	`public function supports(Expr $expr): bool`
`56`	`56`	`{`
`57`		`- return $expr instanceof New_;`
	`57`	`+ return $expr instanceof New_ && !$expr->isFirstClassCallable();`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function __construct(`
`56`	`56`
`57`	`57`	`public function supports(Expr $expr): bool`
`58`	`58`	`{`
`59`		`- return $expr instanceof StaticCall;`
	`59`	`+ return $expr instanceof StaticCall && !$expr->isFirstClassCallable();`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Expr $expr, MutatingScope $scope, ExpressionResultStorage $storage, callable $nodeCallback, ExpressionContext $context): ExpressionResult`