From 25ddf938d8f71485ab9630428920ea8474504db4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Pudil?= Date: Tue, 7 Jun 2022 10:03:39 +0200 Subject: [PATCH] Simplify parsing of type alias import --- src/Parser/PhpDocParser.php | 9 +-------- tests/PHPStan/Parser/PhpDocParserTest.php | 6 ++++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/Parser/PhpDocParser.php b/src/Parser/PhpDocParser.php index bf57a268..23022323 100644 --- 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 index 0a7a3689..28b0a8e1 100644 --- 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' ) ) ),