Fix handling of square brackets

Author: TimWolla

src/Standards/Generic/Sniffs/CodeAnalysis/MixedBooleanOperatorSniff.php

@@ -51,50 +51,52 @@ public function process(File $phpcsFile, $stackPtr)
         $token  = $tokens[$stackPtr];
 
         $start = $phpcsFile->findStartOfStatement($stackPtr);
-        $end   = $phpcsFile->findEndOfStatement($stackPtr);
-
-        $nearestParens = null;
-        if (isset($token['nested_parenthesis']) === true) {
-            $parens = $token['nested_parenthesis'];
-            end($parens);
-            $nearestParens = key($parens);
-
-            $start = $nearestParens;
-            $end   = $parens[$start];
-        }
-
-        $nearestBracket = $phpcsFile->findPrevious(T_OPEN_SQUARE_BRACKET, $stackPtr);
 
         if ($token['code'] === T_BOOLEAN_AND) {
-            $search = [T_BOOLEAN_OR];
+            $search = T_BOOLEAN_OR;
         } else if ($token['code'] === T_BOOLEAN_OR) {
-            $search = [T_BOOLEAN_AND];
+            $search = T_BOOLEAN_AND;
         } else {
             throw new \LogicException('Unreachable');
         }
 
-        do {
-            $found = $phpcsFile->findNext($search, $start, $end);
-            if ($found === false) {
+        while (true) {
+            $previous = $phpcsFile->findPrevious(
+                [
+                    $search,
+                    T_OPEN_PARENTHESIS,
+                    T_OPEN_SQUARE_BRACKET,
+                    T_CLOSE_PARENTHESIS,
+                    T_CLOSE_SQUARE_BRACKET,
+                ],
+                $stackPtr,
+                $start
+            );
+
+            if (!$previous) {
                 break;
             }
 
-            $foundParens = null;
-            if (isset($tokens[$found]['nested_parenthesis']) === true) {
-                $parens = $tokens[$found]['nested_parenthesis'];
-                end($parens);
-                $foundParens = key($parens);
-            }
-
-            $foundBracket = $phpcsFile->findPrevious(T_OPEN_SQUARE_BRACKET, $found);
-
-            if ($nearestParens === $foundParens && $nearestBracket === $foundBracket) {
+            if ($tokens[$previous]['code'] === T_OPEN_PARENTHESIS
+                || $tokens[$previous]['code'] === T_OPEN_SQUARE_BRACKET
+            ) {
+                // We halt if we reach the opening parens / bracket of the boolean operator.
+                return;
+            } else if ($tokens[$previous]['code'] === T_CLOSE_PARENTHESIS) {
+                // We skip the content of nested parens.
+                $stackPtr = ($tokens[$previous]['parenthesis_opener'] - 1);
+            } else if ($tokens[$previous]['code'] === T_CLOSE_SQUARE_BRACKET) {
+                // We skip the content of nested brackets.
+                $stackPtr = ($tokens[$previous]['bracket_opener'] - 1);
+            } else if ($tokens[$previous]['code'] === $search) {
+                // We reached a mismatching operator, thus we must report the error.
                 $error = "Mixed '&&' and '||' within an expression without using parentheses.";
                 $phpcsFile->addError($error, $stackPtr, 'MissingParentheses', []);
+                return;
+            } else {
+                throw new \LogicException('Unreachable');
             }
-
-            $start = ($found + 1);
-        } while ($start !== false);
+        }//end while
 
     }//end process()
 

src/Standards/Generic/Tests/CodeAnalysis/MixedBooleanOperatorUnitTest.inc

@@ -29,3 +29,6 @@ if (true && foo(true || true));
 if (true && foo(true && true || true));
 if (true && $foo[true || true]);
 if (true && $foo[true && true || true]);
+
+if (true && foo(true) || true);
+if (true && $foo[true] || true);

src/Standards/Generic/Tests/CodeAnalysis/MixedBooleanOperatorUnitTest.php

@@ -26,13 +26,14 @@ class MixedBooleanOperatorUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            3  => 2,
-            7  => 2,
-            12 => 2,
-            16 => 1,
+            3  => 1,
+            7  => 1,
+            12 => 1,
             17 => 1,
-            29 => 2,
-            31 => 2,
+            29 => 1,
+            31 => 1,
+            33 => 1,
+            34 => 1,
         ];
 
     }//end getErrorList()