[WIP][Routing] Fix the annotation loader taking a class constant as a beginning of a class name #18634
Conversation
This file contains hidden or 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
…nning of a class name
| @@ -96,6 +96,8 @@ protected function findClass($file) | ||
| $token = $tokens[$i]; | ||
|
|
||
| if (!isset($token[1])) { | ||
| $class = false; |
There was a problem hiding this comment.
I'm not sure if this really fixes the problem.
Example:
public function doBar()
{
$isAbc = MyClass::class === ABC;
}
I'll find "ABC" as a class name.
It seems that the problm is on line 114/116, i.e. the condition:
if (T_CLASS === $token[0]) {
because having T_CLASS token doesn't really mean that we've found a class definition.
Until PHP token_get_all() function can differentiate between class MyClass { ... (which is really a class definition), and MyClass::class (which isn't), I think this condition needs to be extended, e.g.:
$previousTokenIsPaamayimNekudotayim = isset($tokens[$i - 1]) && T_PAAMAYIM_NEKUDOTAYIM === $tokens[$i - 1][0];
if (T_CLASS === $token[0] && !$previousTokenIsPaamayimNekudotayim) {
$class = true;
}
There was a problem hiding this comment.
As I said this is not ready yet. Thanks for feedback so far!
|
I'm offline till June. If anyone wants to take over this PR, feel free to do so. Otherwise I'll finish this off when I'm back. |
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.
Hold on with the merge. I'd like to see if there should be more test cases added first.