Skip to content

Commit 8dce54e

Browse files
authored
Merge pull request #941 from PHPCSStandards/feature/squiz-operatorbrackets-minor-simplification
Squiz/OperatorBracket: stability tweak
2 parents d231969 + 78089cb commit 8dce54e

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php

+19-21
Original file line numberDiff line numberDiff line change
@@ -133,24 +133,23 @@ public function process(File $phpcsFile, $stackPtr)
133133

134134
// Tokens that are allowed inside a bracketed operation.
135135
$allowed = [
136-
T_VARIABLE,
137-
T_LNUMBER,
138-
T_DNUMBER,
139-
T_STRING,
140-
T_WHITESPACE,
141-
T_NS_SEPARATOR,
142-
T_THIS,
143-
T_SELF,
144-
T_STATIC,
145-
T_PARENT,
146-
T_OBJECT_OPERATOR,
147-
T_NULLSAFE_OBJECT_OPERATOR,
148-
T_DOUBLE_COLON,
149-
T_OPEN_SQUARE_BRACKET,
150-
T_CLOSE_SQUARE_BRACKET,
151-
T_MODULUS,
152-
T_NONE,
153-
T_BITWISE_NOT,
136+
T_VARIABLE => T_VARIABLE,
137+
T_LNUMBER => T_LNUMBER,
138+
T_DNUMBER => T_DNUMBER,
139+
T_STRING => T_STRING,
140+
T_WHITESPACE => T_WHITESPACE,
141+
T_NS_SEPARATOR => T_NS_SEPARATOR,
142+
T_THIS => T_THIS,
143+
T_SELF => T_SELF,
144+
T_STATIC => T_STATIC,
145+
T_PARENT => T_PARENT,
146+
T_OBJECT_OPERATOR => T_OBJECT_OPERATOR,
147+
T_NULLSAFE_OBJECT_OPERATOR => T_NULLSAFE_OBJECT_OPERATOR,
148+
T_DOUBLE_COLON => T_DOUBLE_COLON,
149+
T_OPEN_SQUARE_BRACKET => T_OPEN_SQUARE_BRACKET,
150+
T_CLOSE_SQUARE_BRACKET => T_CLOSE_SQUARE_BRACKET,
151+
T_NONE => T_NONE,
152+
T_BITWISE_NOT => T_BITWISE_NOT,
154153
];
155154

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

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

190189
for ($next = ($stackPtr + 1); $next < $endBracket; $next++) {
191-
if (in_array($tokens[$next]['code'], $allowed, true) === true) {
190+
if (isset($allowed[$tokens[$next]['code']]) === true) {
192191
continue;
193192
}
194193

@@ -290,7 +289,6 @@ public function addMissingBracketsError($phpcsFile, $stackPtr)
290289
T_OBJECT_OPERATOR => true,
291290
T_NULLSAFE_OBJECT_OPERATOR => true,
292291
T_DOUBLE_COLON => true,
293-
T_MODULUS => true,
294292
T_ISSET => true,
295293
T_ARRAY => true,
296294
T_NONE => true,

0 commit comments

Comments
 (0)