Skip to content

Squiz/OperatorBracket: stability tweak #941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 7, 2025
Merged

Squiz/OperatorBracket: stability tweak #941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44b114
Squiz/OperatorBracket: remove some redundancy
jrfnl Apr 6, 2025
78089cb
Squiz/OperatorBracket: stability tweak
jrfnl Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,24 +133,23 @@ public function process(File $phpcsFile, $stackPtr)

// Tokens that are allowed inside a bracketed operation.
$allowed = [
T_VARIABLE,
T_LNUMBER,
T_DNUMBER,
T_STRING,
T_WHITESPACE,
T_NS_SEPARATOR,
T_THIS,
T_SELF,
T_STATIC,
T_PARENT,
T_OBJECT_OPERATOR,
T_NULLSAFE_OBJECT_OPERATOR,
T_DOUBLE_COLON,
T_OPEN_SQUARE_BRACKET,
T_CLOSE_SQUARE_BRACKET,
T_MODULUS,
T_NONE,
T_BITWISE_NOT,
T_VARIABLE => T_VARIABLE,
T_LNUMBER => T_LNUMBER,
T_DNUMBER => T_DNUMBER,
T_STRING => T_STRING,
T_WHITESPACE => T_WHITESPACE,
T_NS_SEPARATOR => T_NS_SEPARATOR,
T_THIS => T_THIS,
T_SELF => T_SELF,
T_STATIC => T_STATIC,
T_PARENT => T_PARENT,
T_OBJECT_OPERATOR => T_OBJECT_OPERATOR,
T_NULLSAFE_OBJECT_OPERATOR => T_NULLSAFE_OBJECT_OPERATOR,
T_DOUBLE_COLON => T_DOUBLE_COLON,
T_OPEN_SQUARE_BRACKET => T_OPEN_SQUARE_BRACKET,
T_CLOSE_SQUARE_BRACKET => T_CLOSE_SQUARE_BRACKET,
T_NONE => T_NONE,
T_BITWISE_NOT => T_BITWISE_NOT,
];

$allowed += Tokens::$operators;
Expand All @@ -172,7 +171,7 @@ public function process(File $phpcsFile, $stackPtr)
// We allow simple operations to not be bracketed.
// For example, ceil($one / $two).
for ($prev = ($stackPtr - 1); $prev > $bracket; $prev--) {
if (in_array($tokens[$prev]['code'], $allowed, true) === true) {
if (isset($allowed[$tokens[$prev]['code']]) === true) {
continue;
}

Expand All @@ -188,7 +187,7 @@ public function process(File $phpcsFile, $stackPtr)
}

for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
if (in_array($tokens[$next]['code'], $allowed, true) === true) {
if (isset($allowed[$tokens[$next]['code']]) === true) {
continue;
}

Expand Down Expand Up @@ -290,7 +289,6 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
T_OBJECT_OPERATOR => true,
T_NULLSAFE_OBJECT_OPERATOR => true,
T_DOUBLE_COLON => true,
T_MODULUS => true,
T_ISSET => true,
T_ARRAY => true,
T_NONE => true,
Expand Down