Simplify parsing of type alias import

phpstan · Jun 20, 2022 · 25ddf93 · 25ddf93
1 parent 4a07085
commit 25ddf93
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php
@@ -429,14 +429,7 @@ private function parseTypeAliasImportTagValue(TokenIterator $tokens): Ast\PhpDoc
 		$importedAlias = $tokens->currentTokenValue();
 		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);
 
-		if (!$tokens->tryConsumeTokenValue('from')) {
-			throw new ParserException(
-				$tokens->currentTokenValue(),
-				$tokens->currentTokenType(),
-				$tokens->currentTokenOffset(),
-				Lexer::TOKEN_IDENTIFIER
-			);
-		}
+		$tokens->consumeTokenValue(Lexer::TOKEN_IDENTIFIER, 'from');
 
 		$importedFrom = $tokens->currentTokenValue();
 		$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);

diff --git a/tests/PHPStan/Parser/PhpDocParserTest.php b/tests/PHPStan/Parser/PhpDocParserTest.php
@@ -3679,7 +3679,8 @@ public function provideTypeAliasImportTagsData(): Iterator
 							'*/',
 							Lexer::TOKEN_CLOSE_PHPDOC,
 							35,
-							Lexer::TOKEN_IDENTIFIER
+							Lexer::TOKEN_IDENTIFIER,
+							'from'
 						)
 					)
 				),
@@ -3698,7 +3699,8 @@ public function provideTypeAliasImportTagsData(): Iterator
 							'as',
 							Lexer::TOKEN_IDENTIFIER,
 							35,
-							Lexer::TOKEN_IDENTIFIER
+							Lexer::TOKEN_IDENTIFIER,
+							'from'
 						)
 					)
 				),