Fix potential assert failures - use getRawArgs() instead

ondrejmirtes · ondrejmirtes · commit 6cd3d5d61db9 · 2022-09-29T10:34:31.000+02:00
diff --git a/src/Parser/ArrayFilterArgVisitor.php b/src/Parser/ArrayFilterArgVisitor.php
@@ -15,7 +15,7 @@ public function enterNode(Node $node): ?Node
 		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'array_filter') {
-				$args = $node->getArgs();
+				$args = $node->getRawArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/src/Parser/ArrayMapArgVisitor.php b/src/Parser/ArrayMapArgVisitor.php
@@ -14,7 +14,7 @@ class ArrayMapArgVisitor extends NodeVisitorAbstract
 
 	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_map') {
 				$args = $node->getArgs();
diff --git a/src/Parser/ArrayWalkArgVisitor.php b/src/Parser/ArrayWalkArgVisitor.php
@@ -15,7 +15,7 @@ public function enterNode(Node $node): ?Node
 		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'array_walk') {
-				$args = $node->getArgs();
+				$args = $node->getRawArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/src/Parser/ArrowFunctionArgVisitor.php b/src/Parser/ArrowFunctionArgVisitor.php
@@ -14,7 +14,7 @@ class ArrowFunctionArgVisitor extends NodeVisitorAbstract
 	public function enterNode(Node $node): ?Node
 	{
 		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\ArrowFunction) {
-			$args = $node->getArgs();
+			$args = $node->getRawArgs();
 
 			if (count($args) > 0) {
 				$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);
diff --git a/src/Parser/ClosureArgVisitor.php b/src/Parser/ClosureArgVisitor.php
@@ -14,7 +14,7 @@ class ClosureArgVisitor extends NodeVisitorAbstract
 	public function enterNode(Node $node): ?Node
 	{
 		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {
-			$args = $node->getArgs();
+			$args = $node->getRawArgs();
 
 			if (count($args) > 0) {
 				$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);
diff --git a/src/Parser/CurlSetOptArgVisitor.php b/src/Parser/CurlSetOptArgVisitor.php
@@ -15,7 +15,7 @@ public function enterNode(Node $node): ?Node
 		if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {
 			$functionName = $node->name->toLowerString();
 			if ($functionName === 'curl_setopt') {
-				$args = $node->getArgs();
+				$args = $node->getRawArgs();
 				if (isset($args[0])) {
 					$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);
 				}
diff --git a/tests/PHPStan/Analyser/AnalyserIntegrationTest.php b/tests/PHPStan/Analyser/AnalyserIntegrationTest.php
@@ -982,6 +982,12 @@ public function testBug7963Two(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug8078(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-8078.php');
+		$this->assertNoErrors($errors);
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]
diff --git a/tests/PHPStan/Analyser/data/bug-8078.php b/tests/PHPStan/Analyser/data/bug-8078.php
@@ -0,0 +1,11 @@
+<?php // lint >= 8.1
+
+namespace Bug8078;
+
+class HelloWorld
+{
+	public function test(): void
+	{
+		$closure = (static fn (): string => 'evaluated Closure')(...);
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function enterNode(Node $node): ?Node`
`15`	`15`	`if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
`16`	`16`	`$functionName = $node->name->toLowerString();`
`17`	`17`	`if ($functionName === 'array_filter') {`
`18`		`- $args = $node->getArgs();`
	`18`	`+ $args = $node->getRawArgs();`
`19`	`19`	`if (isset($args[0])) {`
`20`	`20`	`$args[0]->setAttribute(self::ATTRIBUTE_NAME, true);`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ArrayMapArgVisitor extends NodeVisitorAbstract`
`14`	`14`
`15`	`15`	`public function enterNode(Node $node): ?Node`
`16`	`16`	`{`
`17`		`- if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name) {`
	`17`	`+ if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Name && !$node->isFirstClassCallable()) {`
`18`	`18`	`$functionName = $node->name->toLowerString();`
`19`	`19`	`if ($functionName === 'array_map') {`
`20`	`20`	`$args = $node->getArgs();`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ArrowFunctionArgVisitor extends NodeVisitorAbstract`
`14`	`14`	`public function enterNode(Node $node): ?Node`
`15`	`15`	`{`
`16`	`16`	`if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\ArrowFunction) {`
`17`		`- $args = $node->getArgs();`
	`17`	`+ $args = $node->getRawArgs();`
`18`	`18`
`19`	`19`	`if (count($args) > 0) {`
`20`	`20`	`$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ClosureArgVisitor extends NodeVisitorAbstract`
`14`	`14`	`public function enterNode(Node $node): ?Node`
`15`	`15`	`{`
`16`	`16`	`if ($node instanceof Node\Expr\FuncCall && $node->name instanceof Node\Expr\Closure) {`
`17`		`- $args = $node->getArgs();`
	`17`	`+ $args = $node->getRawArgs();`
`18`	`18`
`19`	`19`	`if (count($args) > 0) {`
`20`	`20`	`$node->name->setAttribute(self::ATTRIBUTE_NAME, $args);`