Remove line from "nikic/php-parser" error message

Author: Michael Voříšek

src/Analyser/FileAnalyser.php

@@ -207,7 +207,7 @@ public function analyseFile(
 					}
 				}
 			} catch (\PhpParser\Error $e) {
-				$fileErrors[] = new Error($e->getMessage(), $file, $e->getStartLine() !== -1 ? $e->getStartLine() : null, $e);
+				$fileErrors[] = new Error($e->getRawMessage(), $file, $e->getStartLine() !== -1 ? $e->getStartLine() : null, $e);
 			} catch (ParserErrorsException $e) {
 				foreach ($e->getErrors() as $error) {
 					$fileErrors[] = new Error($error->getMessage(), $e->getParsedFile() ?? $file, $error->getStartLine() !== -1 ? $error->getStartLine() : null, $e);

src/Parser/ParserErrorsException.php

@@ -22,7 +22,7 @@ public function __construct(
 		private ?string $parsedFile,
 	)
 	{
-		parent::__construct(implode(', ', array_map(static fn (Error $error): string => $error->getMessage(), $errors)));
+		parent::__construct(implode(', ', array_map(static fn (Error $error): string => $error->getRawMessage(), $errors)));
 		if (count($errors) > 0) {
 			$this->attributes = $errors[0]->getAttributes();
 		} else {

tests/PHPStan/Analyser/AnalyserIntegrationTest.php

@@ -1285,6 +1285,14 @@ public function testBug10302(): void
 		$this->assertNoErrors($errors);
 	}
 
+	public function testBug10358(): void
+	{
+		$errors = $this->runAnalyse(__DIR__ . '/data/bug-10358.php');
+		$this->assertCount(1, $errors);
+		$this->assertSame('Cannot use Ns\Foo2 as Foo because the name is already in use', $errors[0]->getMessage());
+		$this->assertSame(6, $errors[0]->getLine());
+	}
+
 	public function testBug10509(): void
 	{
 		$errors = $this->runAnalyse(__DIR__ . '/data/bug-10509.php');

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

@@ -0,0 +1,8 @@
+<?php
+
+namespace Bug10358;
+
+use Ns\Foo;
+use Ns\Foo2 as Foo;
+
+class Foo {}