Fix ClosureArgVisitor

ondrejmirtes · ondrejmirtes · commit e753dfd4a4d7 · 2022-09-29T10:40:22.000+02:00
diff --git a/src/Parser/ClosureArgVisitor.php b/src/Parser/ClosureArgVisitor.php
@@ -13,8 +13,8 @@ class ClosureArgVisitor extends NodeVisitorAbstract
 
 	public function enterNode(Node $node): ?Node
 	{
-		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {
-			$args = $node->getRawArgs();
+		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure && !$node->isFirstClassCallable()) {
+			$args = $node->getArgs();
 
 			if (count($args) > 0) {
 				$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);
diff --git a/tests/PHPStan/Analyser/data/bug-8072.php b/tests/PHPStan/Analyser/data/bug-8072.php
@@ -10,4 +10,11 @@ function say(\Closure $bar): string
 function (): void {
 	echo say(fn (string $name = null) => 'Hi');
 	echo say((fn (string $name = null) => 'Hi')(...));
+
+	echo say(function (string $name = null) {
+		return 'Hi';
+	});
+	echo say((function (string $name = null) {
+		return 'Hi';
+	})(...));
 };

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ class ClosureArgVisitor extends NodeVisitorAbstract`
`13`	`13`
`14`	`14`	`public function enterNode(Node $node): ?Node`
`15`	`15`	`{`
`16`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {`
`17`		`- $args = $node->getRawArgs();`
	`16`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure && !$node->isFirstClassCallable()) {`
	`17`	`+ $args = $node->getArgs();`
`18`	`18`
`19`	`19`	`if (count($args) > 0) {`
`20`	`20`	`$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);`