Use a line-based index to disambiguate anonymous classes

Author: tscni

conf/config.neon

@@ -311,6 +311,11 @@ services:
 			options:
 				preserveOriginalNames: true
 
+	-
+		class: PHPStan\Parser\AnonymousClassVisitor
+		tags:
+			- phpstan.parser.richParserNodeVisitor
+
 	-
 		class: PHPStan\Parser\ArrayFilterArgVisitor
 		tags:

src/Broker/AnonymousClassNameHelper.php

@@ -5,6 +5,7 @@
 use PhpParser\Node;
 use PHPStan\File\FileHelper;
 use PHPStan\File\RelativePathHelper;
+use PHPStan\Parser\AnonymousClassVisitor;
 use PHPStan\ShouldNotHappenException;
 use function md5;
 use function sprintf;
@@ -32,9 +33,17 @@ public function getAnonymousClassName(
 			$this->fileHelper->normalizePath($filename, '/'),
 		);
 
+		/** @var int|null $lineIndex */
+		$lineIndex = $classNode->getAttribute(AnonymousClassVisitor::ATTRIBUTE_LINE_INDEX);
+		if ($lineIndex === null) {
+			$hash = md5(sprintf('%s:%s', $filename, $classNode->getStartLine()));
+		} else {
+			$hash = md5(sprintf('%s:%s:%d', $filename, $classNode->getStartLine(), $lineIndex));
+		}
+
 		return sprintf(
 			'AnonymousClass%s',
-			md5(sprintf('%s:%s', $filename, $classNode->getStartFilePos())),
+			$hash,
 		);
 	}
 

src/Parser/AnonymousClassVisitor.php

@@ -0,0 +1,49 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Parser;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+use function count;
+
+class AnonymousClassVisitor extends NodeVisitorAbstract
+{
+
+	public const ATTRIBUTE_LINE_INDEX = 'anonymousClassLineIndex';
+
+	/** @var array<int, non-empty-list<Node\Stmt\Class_>> */
+	private array $nodesPerLine = [];
+
+	public function beforeTraverse(array $nodes): ?array
+	{
+		$this->nodesPerLine = [];
+		return null;
+	}
+
+	public function enterNode(Node $node): ?Node
+	{
+		if (!$node instanceof Node\Stmt\Class_ || !$node->isAnonymous()) {
+			return null;
+		}
+
+		$this->nodesPerLine[$node->getStartLine()][] = $node;
+
+		return null;
+	}
+
+	public function afterTraverse(array $nodes): ?array
+	{
+		foreach ($this->nodesPerLine as $nodesOnLine) {
+			if (count($nodesOnLine) === 1) {
+				continue;
+			}
+			for ($i = 0; $i < count($nodesOnLine); $i++) {
+				$nodesOnLine[$i]->setAttribute(self::ATTRIBUTE_LINE_INDEX, $i + 1);
+			}
+		}
+
+		$this->nodesPerLine = [];
+		return null;
+	}
+
+}

src/Reflection/BetterReflection/BetterReflectionProvider.php

@@ -24,6 +24,7 @@
 use PHPStan\File\FileHelper;
 use PHPStan\File\FileReader;
 use PHPStan\File\RelativePathHelper;
+use PHPStan\Parser\AnonymousClassVisitor;
 use PHPStan\Php\PhpVersion;
 use PHPStan\PhpDoc\PhpDocInheritanceResolver;
 use PHPStan\PhpDoc\StubPhpDocProvider;
@@ -214,6 +215,14 @@ public function getAnonymousClassReflection(Node\Stmt\Class_ $classNode, Scope $
 			null,
 		);
 
+		/** @var int|null $classLineIndex */
+		$classLineIndex = $classNode->getAttribute(AnonymousClassVisitor::ATTRIBUTE_LINE_INDEX);
+		if ($classLineIndex === null) {
+			$displayName = sprintf('class@anonymous/%s:%s', $filename, $classNode->getStartLine());
+		} else {
+			$displayName = sprintf('class@anonymous/%s:%s:%d', $filename, $classNode->getStartLine(), $classLineIndex);
+		}
+
 		self::$anonymousClasses[$className] = new ClassReflection(
 			$this->reflectionProviderProvider->getReflectionProvider(),
 			$this->initializerExprTypeResolver,
@@ -227,7 +236,7 @@ public function getAnonymousClassReflection(Node\Stmt\Class_ $classNode, Scope $
 			$this->classReflectionExtensionRegistryProvider->getRegistry()->getAllowedSubTypesClassReflectionExtensions(),
 			$this->classReflectionExtensionRegistryProvider->getRegistry()->getRequireExtendsPropertyClassReflectionExtension(),
 			$this->classReflectionExtensionRegistryProvider->getRegistry()->getRequireExtendsMethodsClassReflectionExtension(),
-			sprintf('class@anonymous/%s:%s', $filename, $classNode->getStartLine()),
+			$displayName,
 			new ReflectionClass($reflectionClass),
 			$scopeFile,
 			null,

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -8335,12 +8335,12 @@ public function dataAnonymousClass(): array
 	{
 		return [
 			[
-				'$this(AnonymousClass6a0687bc4f876de22e6d370597168d67)',
+				'$this(AnonymousClass3301acd9e9d13ba9bbce9581cdb00699)',
 				'$this',
 				"'inside'",
 			],
 			[
-				'AnonymousClass6a0687bc4f876de22e6d370597168d67',
+				'AnonymousClass3301acd9e9d13ba9bbce9581cdb00699',
 				'$foo',
 				"'outside'",
 			],
@@ -8388,7 +8388,7 @@ public function dataAnonymousClassInTrait(): array
 	{
 		return [
 			[
-				'$this(AnonymousClassa90f7ae5a3564e08aca97d6fbb39c2b2)',
+				'$this(AnonymousClass3de0a9734314db9dec21ba308363ff9a)',
 				'$this',
 			],
 		];
@@ -8413,17 +8413,17 @@ public function dataAnonymousClassNameSameLine(): array
 	{
 		return [
 			[
-				'AnonymousClass6540444db24e3b8821f292cc08bb9b6c',
+				'AnonymousClass0d7d08272ba2f0a6ef324bb65c679e02',
 				'$foo',
 				'$bar',
 			],
 			[
-				'AnonymousClass7c37a0e958f6b76cfeb23acfa3259ff8',
+				'AnonymousClass464f64cbdca25b4af842cae65615bca9',
 				'$bar',
 				'$baz',
 			],
 			[
-				'AnonymousClassca84fbe02c775710b2735bfe3cbfbb7e',
+				'AnonymousClassa9fb472ec9acc5cae3bee4355c296bfa',
 				'$baz',
 				'die',
 			],