Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ class RequireExplicitBooleanOperatorPrecedenceSniff implements Sniff
*/
public function register()
{
$this->searchTargets = Tokens::$booleanOperators;
$this->searchTargets += Tokens::$blockOpeners;
$this->searchTargets = Tokens::$booleanOperators;
$this->searchTargets[T_INLINE_THEN] = T_INLINE_THEN;
$this->searchTargets[T_INLINE_ELSE] = T_INLINE_ELSE;

Expand Down Expand Up @@ -102,12 +101,6 @@ public function process(File $phpcsFile, $stackPtr)
return;
}

if (isset(Tokens::$blockOpeners[$tokens[$previous]['code']]) === true) {
// Beginning of the expression found for a block opener. Needed to
// correctly handle match arms.
return;
}

// We found a mismatching operator, thus we must report the error.
$error = 'Mixing different binary boolean operators within an expression';
$error .= ' without using parentheses to clarify precedence is not allowed.';
Expand Down