[TASK] Use proper docblock type for AbstractLexer::isNextTokenAny()
#63
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
You can use |
greg0ire
reviewed
Feb 27, 2022
| } | ||
|
|
||
| /** | ||
| * @psalm-return list<array{string, list<array{value: string|int, type: string, position: int}>}> |
There was a problem hiding this comment.
Suggested change
| * @psalm-return list<array{string, list<array{value: string|int, type: string, position: int}>}> | |
| * @psalm-return list<array{string, list<array{value: string|int, type: string|int, position: int}>}> |
|
While reading your PR, I noticed there are a lot of repetition of the array shape describing a token. I attempted to extract it into a Psalm type in #64, and was forced by static analysis to apply the main change you did to this PR, as well as some others. Please review it.
I'll do a release as soon as we merge either your PR or mine. |
greg0ire
reviewed
Feb 27, 2022
| @@ -160,7 +160,7 @@ public function isNextToken($token) | |||
| /** | |||
| * Checks whether any of the given tokens matches the current lookahead. | |||
| * | |||
| * @param string[] $tokens | |||
| * @param list<int|string> $tokens | |||
There was a problem hiding this comment.
Should skipUntil be changed as well?
This change adds a test lexer with integer based tokens, which is a valid lexer implementation, at least as this is provided as a simple lexer implementation in the docs. See: https://www.doctrine-project.org/projects/doctrine-lexer/en/1.2/simple-parser-example.html#simple-parser-example
This patch changes the docblock type hint of `AbstractLexer::isNextTokenAny()` to `list<int|string>` to adopt the int and string based support of token types. Thus making phpstan in projects happy which uses this packages for there own lexer implementations. However this only aligns to other token methods which already supports int and string as token types, thus fixing a wrong set type hint through doctrine#48. Fixes: doctrine#62
|
Please address the conflicts, and use a Psalm type. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[TASK] Use proper docblock type for
AbstractLexer::isNextTokenAny()This patch changes the docblock type hint of
AbstractLexer::isNextTokenAny()to
list<int|string>to adopt the int and string based support of token types.Thus making phpstan in projects happy which uses this packages for there own
lexer implementations.
However this only aligns to other token methods which already supports int and
string as token types, thus fixing a wrong set type hint through #48.
Additionally a concrete lexer implementation was added to test a lexer implemention
with integer based tokens, adopted from the already string based implementation.
If this got accepted and merged, it would be nice to have a patchlevel release in
the nearer time.
Fixes: #62