unique index for same-line anonymous classes

Author: staabm

src/Parser/VariadicMethodsVisitor.php

@@ -12,6 +12,7 @@
 use function array_pop;
 use function implode;
 use function in_array;
+use function sprintf;
 
 final class VariadicMethodsVisitor extends NodeVisitorAbstract
 {
@@ -30,6 +31,8 @@ final class VariadicMethodsVisitor extends NodeVisitorAbstract
 	/** @var array<string, array<string, TrinaryLogic>> */
 	private array $variadicMethods = [];
 
+	private int $anonymousClassIndex = 0;
+
 	public const ATTRIBUTE_NAME = 'variadicMethods';
 
 	public function beforeTraverse(array $nodes): ?array
@@ -40,6 +43,7 @@ public function beforeTraverse(array $nodes): ?array
 		$this->classStack = [];
 		$this->inClassLike = null;
 		$this->inMethod = null;
+		$this->anonymousClassIndex = 0;
 
 		return null;
 	}
@@ -54,12 +58,9 @@ public function enterNode(Node $node): ?Node
 			$this->inNamespace = $node->name->toString();
 		}
 
-		if (
-			$node instanceof Node\Stmt\Class_
-			|| $node instanceof Node\Stmt\ClassLike
-		) {
+		if ($node instanceof Node\Stmt\ClassLike) {
 			if (!$node->name instanceof Node\Identifier) {
-				$className = 'class@anonymous:' . $node->getStartLine();
+				$className = sprintf('class@anonymous:%s:%s', $node->getStartLine(), ++$this->anonymousClassIndex);
 			} else {
 				$className = $node->name->name;
 			}
@@ -101,10 +102,7 @@ public function leaveNode(Node $node): ?Node
 			$this->inMethod = null;
 		}
 
-		if (
-			$node instanceof Node\Stmt\Class_
-			|| $node instanceof Node\Stmt\ClassLike
-		) {
+		if ($node instanceof Node\Stmt\ClassLike) {
 			array_pop($this->classStack);
 
 			if ($this->classStack !== []) {

tests/PHPStan/Parser/ParserTest.php

@@ -39,16 +39,20 @@ public function dataVariadicCallLikes(): iterable
 					'variadic_fnZ' => TrinaryLogic::createNo(), // variadicness later on detected via reflection
 					'implicit_variadic_fnZ' => TrinaryLogic::createYes(),
 				],
-				'VariadicMethod\Z\class@anonymous:20' => [
+				'VariadicMethod\Z\class@anonymous:20:1' => [
 					'non_variadic_fn_subZ' => TrinaryLogic::createNo(),
 					'variadic_fn_subZ' => TrinaryLogic::createNo(), // variadicness later on detected via reflection
 					'implicit_variadic_subZ' => TrinaryLogic::createYes(),
 				],
-				'VariadicMethod\class@anonymous:42' => [
+				'VariadicMethod\class@anonymous:42:2' => [
 					'non_variadic_fn' => TrinaryLogic::createNo(),
 					'variadic_fn' => TrinaryLogic::createNo(), // variadicness later on detected via reflection
 					'implicit_variadic_fn' => TrinaryLogic::createYes(),
 				],
+				'VariadicMethod\class@anonymous:54:3' => [
+					'implicit_variadic_fn' => TrinaryLogic::createYes(),
+				],
+				'VariadicMethod\class@anonymous:54:4' => [],
 			],
 		];
 
@@ -72,7 +76,7 @@ public function dataVariadicCallLikes(): iterable
 	 */
 	public function testSimpleParserVariadicCallLikes(string $file, string $attributeName, array $expectedVariadics): void
 	{
-		/** @var RichParser $parser */
+		/** @var SimpleParser $parser */
 		$parser = self::getContainer()->getService('currentPhpVersionSimpleParser');
 		$ast = $parser->parseFile($file);
 		$variadics = $ast[0]->getAttribute($attributeName);

tests/PHPStan/Parser/data/variadic-methods.php

@@ -50,3 +50,9 @@ function implicit_variadic_fn() {
 		$args = func_get_args();
 	}
 };
+
+$c = new class (new class {}) {
+	function implicit_variadic_fn() {
+		$args = func_get_args();
+	}
+};