Allow doctrine/lexer 2 #460
Merged
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
greg0ire
force-pushed
the
allow-lexer-2
branch
from
98d1200 to
83fc5d1
Compare
|
SA is broken, I will fix it once doctrine/lexer 2 is removed, but I just wanted to show here that things are OK according to PHPUnit. |
greg0ire
commented
Dec 10, 2022
| @@ -126,4 +126,12 @@ protected function getType(&$value) | |||
|
|
|||
| return $type; | |||
| } | |||
|
|
|||
| /** @return array{value: int|string, type:string|int|null, position:int} */ | |||
| public function peek(): array | |||
There was a problem hiding this comment.
No need to also override glimpse since it returns whatever peek() returns.
It is still possible to avoid a BC-break while doing so.
greg0ire
force-pushed
the
allow-lexer-2
branch
from
83fc5d1 to
2286f7b
Compare
derrabus
approved these changes
Dec 11, 2022
alcohol
reviewed
Dec 12, 2022
| { | ||
| $token = parent::peek(); | ||
|
|
||
| return (array) $token; |
There was a problem hiding this comment.
Should the array type always be forced here? In v1.13.x that was not the case because the method was inherited from the parent class. The docblock does not state that an empty array could be returned, but that is exactly what will be returned when the parent returns null right now.
There was a problem hiding this comment.
No, we should not cast null to an array. Up for a PR?
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.
It is still possible to avoid a BC-break while doing so.