Add support for trailing comma

Author: Andreas Frömer

src/Parser/TypeParser.php

@@ -167,10 +167,15 @@ public function parseGeneric(TokenIterator $tokens, Ast\Type\IdentifierTypeNode
 		$tokens->consumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET);
 		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 		$genericTypes = [$this->parse($tokens)];
-        $tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+
+		$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 
 		while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
 			$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
+			if ($tokens->tryConsumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET)) {
+				// trailing comma case
+				return new Ast\Type\GenericTypeNode($baseType, $genericTypes);
+			}
 			$genericTypes[] = $this->parse($tokens);
 			$tokens->tryConsumeTokenType(Lexer::TOKEN_PHPDOC_EOL);
 		}

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -3079,29 +3079,6 @@ public function provideRealWorldExampleData(): \Iterator
 			]),
 		];
 
-//		yield [
-//			'multiline generic types - trailing comma',
-//			'/**' . PHP_EOL .
-//			' * @implements Foo<' . PHP_EOL .
-//			' *    A,' . PHP_EOL .
-//			' * >' . PHP_EOL .
-//			' */',
-//			new PhpDocNode([
-//				new PhpDocTagNode(
-//					'@implements',
-//					new ImplementsTagValueNode(
-//						new GenericTypeNode(
-//							new IdentifierTypeNode('Foo'),
-//							[
-//								new IdentifierTypeNode('A'),
-//							]
-//						),
-//						''
-//					)
-//				),
-//			]),
-//		];
-
 		yield [
 			'multiline generic types - leading comma',
 			'/**' . PHP_EOL .
@@ -3126,6 +3103,31 @@ public function provideRealWorldExampleData(): \Iterator
 				),
 			]),
 		];
+
+		yield [
+			'multiline generic types - traling comma',
+			'/**' . PHP_EOL .
+			' * @implements Foo<' . PHP_EOL .
+			' *    A,' . PHP_EOL .
+			' *    B,' . PHP_EOL .
+			' * >' . PHP_EOL .
+			' */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@implements',
+					new ImplementsTagValueNode(
+						new GenericTypeNode(
+							new IdentifierTypeNode('Foo'),
+							[
+								new IdentifierTypeNode('A'),
+								new IdentifierTypeNode('B'),
+							]
+						),
+						''
+					)
+				),
+			]),
+		];
 	}
 
 	public function dataParseTagValue(): array

tests/PHPStan/Parser/TypeParserTest.php

@@ -899,7 +899,7 @@ public function provideParseData(): array
 					new ConstTypeNode(new ConstFetchNode('QueueAttributeName', '*')),
 				]),
 			],
-            [
+			[
 				'array<' . PHP_EOL .
 				'  Foo' . PHP_EOL .
 				'>',
@@ -955,6 +955,26 @@ public function provideParseData(): array
 					]
 				),
 			],
+			[
+				'array<' . PHP_EOL .
+				'  Foo,' . PHP_EOL .
+				'  array<' . PHP_EOL .
+				'    Bar,' . PHP_EOL .
+				'  >' . PHP_EOL .
+				'>',
+				new GenericTypeNode(
+					new IdentifierTypeNode('array'),
+					[
+						new IdentifierTypeNode('Foo'),
+						new GenericTypeNode(
+							new IdentifierTypeNode('array'),
+							[
+								new IdentifierTypeNode('Bar'),
+							]
+						),
+					]
+				),
+			],
 		];
 	}