Parsing @phpstan-ignore - allow comma in description

phpstan · May 3, 2024 · c84a072 · c84a072
1 parent 3361c84
commit c84a072
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Parser/RichParser.php b/src/Parser/RichParser.php
@@ -299,7 +299,7 @@ private function parseIdentifiers(string $text, int $ignorePos): array
 			if ($i === 0) {
 				throw new IgnoreParseException('First token is not an identifier', $tokenLine);
 			}
-			if ($tokenType === IgnoreLexer::TOKEN_COMMA) {
+			if ($tokenType === IgnoreLexer::TOKEN_COMMA && $depth === 0) {
 				throw new IgnoreParseException('Unexpected comma (,)', $tokenLine);
 			}
 			if ($tokenType === IgnoreLexer::TOKEN_CLOSE_PARENTHESIS) {

diff --git a/tests/PHPStan/Parser/RichParserTest.php b/tests/PHPStan/Parser/RichParserTest.php
@@ -85,6 +85,14 @@ public function dataLinesToIgnore(): iterable
 			],
 		];
 
+		yield [
+			'<?php' . PHP_EOL .
+			'test(); // @phpstan-ignore return.ref, return.non (foo, because...)',
+			[
+				2 => ['return.ref', 'return.non'],
+			],
+		];
+
 		yield [
 			'<?php' . PHP_EOL .
 			'test(); // @phpstan-ignore return.ref, return.non čičí',