FIX Handle __TRAIT__ in i18nTextCollector #10813
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
emteknetnz
force-pushed
the
pulls/5.0/textcollecttraits
branch
from
4b486a9 to
f4e0c76
Compare
GuySartorelli
requested changes
Jun 13, 2023
| @@ -722,7 +722,7 @@ function ($input) { | |||
| } else { | |||
| throw new LogicException("Invalid string escape: " . $text); | |||
| } | |||
| } elseif ($id === T_CLASS_C) { | |||
| } elseif ($id === T_CLASS_C || $id === T_TRAIT_C) { | |||
There was a problem hiding this comment.
Above we're setting $id to T_TRAIT if that's available, but it looks like we're only ever doing anything with it if it's set to T_TRAIT_C.... Should we just always set it to T_TRAIT above for consistency, so we make sure we always handle it here?
There was a problem hiding this comment.
I don't think so
$id gets get to T_TRAIT via
$tokens = token_get_all("<?php\n" . $content);
...
foreach ($tokens as $token) {
...
list($id, $text) = $token;
We then change it to T_TRAIT_C via
$id = $id === T_TRAIT ? T_TRAIT_C : T_CLASS_C;
For this PR I've simply adapted the existing code that handles __CLASS__ tokens inside a class block to handle __TRAIT__ inside a trait block.
There was a problem hiding this comment.
Ahhh okay I misread that $id assigment line. No worries then.
GuySartorelli
approved these changes
Jun 13, 2023
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.
Issue #10810