@template T as bound

phpstan · Nov 18, 2019 · 62c6de6 · 62c6de6
1 parent 3edb515
commit 62c6de6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -320,7 +320,7 @@ private function parseTemplateTagValue(TokenIterator $tokens): Ast\PhpDoc\Templa
 		$name = $tokens->currentTokenValue();
 		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
 
-		if ($tokens->tryConsumeTokenValue('of')) {
+		if ($tokens->tryConsumeTokenValue('of') || $tokens->tryConsumeTokenValue('as')) {
 			$bound = $this->typeParser->parse($tokens);
 
 		} else {

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -2319,6 +2319,21 @@ public function provideTemplateTagsData(): \Iterator
 			]),
 		];
 
+		yield [
+			'OK without description',
+			'/** @template T as DateTime */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@template',
+					new TemplateTagValueNode(
+						'T',
+						new IdentifierTypeNode('DateTime'),
+						''
+					)
+				),
+			]),
+		];
+
 		yield [
 			'OK with bound and description',
 			'/** @template T of DateTime the value type */',
@@ -2334,6 +2349,21 @@ public function provideTemplateTagsData(): \Iterator
 			]),
 		];
 
+		yield [
+			'OK with bound and description',
+			'/** @template T as DateTime the value type */',
+			new PhpDocNode([
+				new PhpDocTagNode(
+					'@template',
+					new TemplateTagValueNode(
+						'T',
+						new IdentifierTypeNode('DateTime'),
+						'the value type'
+					)
+				),
+			]),
+		];
+
 		yield [
 			'invalid without bound and description',
 			'/** @template */',