danog/phpdoc-parser
1
0
Fork 0
mirror of https://github.com/danog/phpdoc-parser.git synced 2024-11-27 04:24:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

TypeParser: ignore unclosed array notation

Browse Source
This commit is contained in:
Jan Tvrdik 2017-11-18 16:15:23 +01:00
parent 3dda8122e1
commit afabfdfe9d
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Parser/TypeParser.php
View File

@ -35,7 +35,7 @@ class TypeParser
$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES); $tokens->consumeTokenType(Lexer::TOKEN_CLOSE_PARENTHESES);
if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { if ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
$type = $this->parseArray($tokens, $type); $type = $this->tryParseArray($tokens, $type);
} }
} elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) { } elseif ($tokens->tryConsumeTokenType(Lexer::TOKEN_THIS_VARIABLE)) {
@ -49,7 +49,7 @@ class TypeParser
$type = $this->parseGeneric($tokens, $type); $type = $this->parseGeneric($tokens, $type);
} elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { } elseif ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
$type = $this->parseArray($tokens, $type); $type = $this->tryParseArray($tokens, $type);
} }
} }
@ -110,11 +110,19 @@ class TypeParser
} }
private function parseArray(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode private function tryParseArray(TokenIterator $tokens, Ast\Type\TypeNode $type): Ast\Type\TypeNode
{ {
while ($tokens->tryConsumeTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) { try {
$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_SQUARE_BRACKET); while ($tokens->isCurrentTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET)) {
$type = new Ast\Type\ArrayTypeNode($type); $tokens->pushSavePoint();
$tokens->consumeTokenType(Lexer::TOKEN_OPEN_SQUARE_BRACKET);
$tokens->consumeTokenType(Lexer::TOKEN_CLOSE_SQUARE_BRACKET);
$tokens->dropSavePoint();
$type = new Ast\Type\ArrayTypeNode($type);
}
} catch (ParserException $e) {
$tokens->rollback();
} }
return $type; return $type;