Support multiple anonymous class definitions on the same line

Author: tscni

src/Broker/AnonymousClassNameHelper.php

@@ -34,7 +34,7 @@ public function getAnonymousClassName(
 
 		return sprintf(
 			'AnonymousClass%s',
-			md5(sprintf('%s:%s', $filename, $classNode->getStartLine())),
+			md5(sprintf('%s:%s', $filename, $classNode->getStartFilePos())),
 		);
 	}
 

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1416,6 +1416,27 @@ public function testBug11297(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug5597(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-5597.php');
+		$this->assertNoErrors($errors);
+	}
+
+	public function testBug11511(): void
+	{
+		if (PHP_VERSION_ID < 80000) {
+			$this->markTestSkipped('Test requires PHP 8.0.');
+		}
+
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-11511.php');
+		$this->assertCount(1, $errors);
+		$this->assertSame('Access to an undefined property object::$bar.', $errors[0]->getMessage());
+	}
+
 	/**
 	 * @param string[]|null $allAnalysedFiles
 	 * @return Error[]

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -8335,12 +8335,12 @@ public function dataAnonymousClass(): array
 	{
 		return [
 			[
-				'$this(AnonymousClass3301acd9e9d13ba9bbce9581cdb00699)',
+				'$this(AnonymousClass6a0687bc4f876de22e6d370597168d67)',
 				'$this',
 				"'inside'",
 			],
 			[
-				'AnonymousClass3301acd9e9d13ba9bbce9581cdb00699',
+				'AnonymousClass6a0687bc4f876de22e6d370597168d67',
 				'$foo',
 				"'outside'",
 			],
@@ -8388,7 +8388,7 @@ public function dataAnonymousClassInTrait(): array
 	{
 		return [
 			[
-				'$this(AnonymousClass3de0a9734314db9dec21ba308363ff9a)',
+				'$this(AnonymousClassa90f7ae5a3564e08aca97d6fbb39c2b2)',
 				'$this',
 			],
 		];
@@ -8409,6 +8409,44 @@ public function testAnonymousClassNameInTrait(
 		);
 	}
 
+	public function dataAnonymousClassNameSameLine(): array
+	{
+		return [
+			[
+				'AnonymousClass6540444db24e3b8821f292cc08bb9b6c',
+				'$foo',
+				'$bar',
+			],
+			[
+				'AnonymousClass7c37a0e958f6b76cfeb23acfa3259ff8',
+				'$bar',
+				'$baz',
+			],
+			[
+				'AnonymousClassca84fbe02c775710b2735bfe3cbfbb7e',
+				'$baz',
+				'die',
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataAnonymousClassNameSameLine
+	 */
+	public function testAnonymousClassNameSameLine(
+		string $description,
+		string $expression,
+		string $evaluatedPointExpression,
+	): void
+	{
+		$this->assertTypes(
+			__DIR__ . '/data/anonymous-class-name-same-line.php',
+			$description,
+			$expression,
+			$evaluatedPointExpression,
+		);
+	}
+
 	public function dataDynamicConstants(): array
 	{
 		return [

tests/PHPStan/Analyser/data/anonymous-class-name-same-line.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace AnonymousClassNameSameLine;
+
+$foo = new class {}; $bar = new class {}; $baz = new class {}; die;

tests/PHPStan/Analyser/data/bug-11511.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1); // lint >= 8.0
+
+namespace Bug11511;
+
+$myObject = new class (new class { public string $bar = 'test'; }) {
+	public function __construct(public object $foo)
+	{
+	}
+};
+echo $myObject->foo->bar;

tests/PHPStan/Analyser/data/bug-5597.php

@@ -0,0 +1,25 @@
+<?php declare(strict_types = 1); // lint >= 8.0
+
+namespace Bug5597;
+
+interface InterfaceA {}
+
+class ClassA implements InterfaceA {}
+
+class ClassB
+{
+	public function __construct(
+        private InterfaceA $parameterA,
+    ) {
+    }
+
+	public function test() : InterfaceA
+	{
+		return $this->parameterA;
+	}
+}
+
+$classA = new class() extends ClassA {};
+$thisWorks = new class($classA) extends ClassB {};
+
+$thisFailsWithTwoErrors = new class(new class() extends ClassA {}) extends ClassB {};