Squiz/OperatorBracket: stability tweak #941
Merged
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.
Description
Squiz/OperatorBracket: remove some redundancy
The
%
modulus token is included in theTokens::$operators
array. No need to add it separately.Squiz/OperatorBracket: stability tweak
The
$allowed
tokens array is joined after declaration with theTokens::$operators
array. This is only reliable if the keys in both arrays are unique (or intended to be overwritten).However, with the
$allowed
array being numerically indexed and PHP native tokens also being integers, this was not the case and could lead to one of the tokens in the original array (unintentionally) being disregarded/overwritten by one of the tokens in theTokens::$operators
array.Fixed now, by making setting the tokens constants both as the key as well as the value, making the entries in the array suitable for an array join operation.
Suggested changelog entry
N/A