allow multiline

Author: shmax

src/Parser/PhpDocParser.php

@@ -1069,6 +1069,11 @@ private function parseTypeAliasTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeA
 
 		$templateTypes = [];
 		if ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_ANGLE_BRACKET)) {
+			// Skip whitespace and newlines after opening bracket
+			while ($tokens->isCurrentTokenType(Lexer::TOKEN_HORIZONTAL_WS, Lexer::TOKEN_PHPDOC_EOL)) {
+				$tokens->next();
+			}
+
 			do {
 				$startLine = $tokens->currentTokenLine();
 				$startIndex = $tokens->currentTokenIndex();
@@ -1078,7 +1083,21 @@ private function parseTypeAliasTagValue(TokenIterator $tokens): Ast\PhpDoc\TypeA
 					$startLine,
 					$startIndex,
 				);
-			} while ($tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA));
+
+				// Skip whitespace and newlines after template type
+				while ($tokens->isCurrentTokenType(Lexer::TOKEN_HORIZONTAL_WS, Lexer::TOKEN_PHPDOC_EOL)) {
+					$tokens->next();
+				}
+
+				if (!$tokens->tryConsumeTokenType(Lexer::TOKEN_COMMA)) {
+					break;
+				}
+
+				// Skip whitespace and newlines after comma
+				while ($tokens->isCurrentTokenType(Lexer::TOKEN_HORIZONTAL_WS, Lexer::TOKEN_PHPDOC_EOL)) {
+					$tokens->next();
+				}
+			} while (true);
 			$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_ANGLE_BRACKET);
 		}
 

tests/PHPStan/Parser/PhpDocParserTest.php

@@ -5225,6 +5225,57 @@ public function provideTypeAliasTagsData(): Iterator
 				),
 			]),
 		];
+
+		yield [
+			'OK multiline with two template types',
+			'/**
+ * @phpstan-type Widget<
+ *     TFoo,
+ *     TBar
+ * > array{foo: TFoo, bar: TBar}
+ */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@phpstan-type',
+					new TypeAliasTagValueNode(
+						'Widget',
+						ArrayShapeNode::createSealed([
+							new ArrayShapeItemNode(new IdentifierTypeNode('foo'), false, new IdentifierTypeNode('TFoo')),
+							new ArrayShapeItemNode(new IdentifierTypeNode('bar'), false, new IdentifierTypeNode('TBar')),
+						]),
+						[
+							new TemplateTagValueNode('TFoo', null, ''),
+							new TemplateTagValueNode('TBar', null, ''),
+						],
+					),
+				),
+			]),
+		];
+
+		yield [
+			'OK multiline with bounded template',
+			'/**
+ * @phpstan-type Collection<
+ *     T of object
+ * > list<T>
+ */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@phpstan-type',
+					new TypeAliasTagValueNode(
+						'Collection',
+						new GenericTypeNode(
+							new IdentifierTypeNode('list'),
+							[new IdentifierTypeNode('T')],
+							[GenericTypeNode::VARIANCE_INVARIANT],
+						),
+						[
+							new TemplateTagValueNode('T', new IdentifierTypeNode('object'), ''),
+						],
+					),
+				),
+			]),
+		];
 	}
 
 	public function provideTypeAliasImportTagsData(): Iterator