Constants/RestrictedConstants: minor improvements#869
Merged
Conversation
This commit introduces `private` property versions of the pre-existing `public` properties, where the array format is different. The `private` properties have the target constant names as the array key, not as the value. This allows for using `isset()` instead of `in_array()`.
The only token this sniff needs to check for (at this time) is the `T_STRING` token, which is used for both constant names as well as function names. Any other token in the `Tokens::$functionNameTokens` token array will never match the subsequent contents comparison anyhow.
…es()` ... to only strip the wrapping quotes and not remove any quotes inside the wrapping quotes, which are part of the actual text string. Includes test.
GaryJones
approved these changes
Jul 30, 2025
GaryJones
deleted the
feature/constants-restrictedconstants-minor-improvements
branch
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Constants/RestrictedConstants: minor efficiency fix
This commit introduces
privateproperty versions of the pre-existingpublicproperties, where the array format is different.The
privateproperties have the target constant names as the array key, not as the value.This allows for using
isset()instead ofin_array().Constants/RestrictedConstants: fix nonsensical comparison
The only token this sniff needs to check for (at this time) is the
T_STRINGtoken, which is used for both constant names as well as function names.Any other token in the
Tokens::$functionNameTokenstoken array will never match the subsequent contents comparison anyhow.Constants/RestrictedConstants: use PHPCSUtils
TextStrings::stripQuotes()... to only strip the wrapping quotes and not remove any quotes inside the wrapping quotes, which are part of the actual text string.
Includes test.