diff --git a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php index 44429012a1..821f9b7f47 100644 --- a/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php +++ b/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php @@ -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; @@ -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; } @@ -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; } @@ -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,