Add T_BOOLEAN_OR to blacklist in case of "and" and T_LOGICAL_XOR in case of "or"

Author: Koopzington

CodeSniffer/Standards/Squiz/Sniffs/Operators/ValidLogicalOperatorsSniff.php

@@ -98,6 +98,13 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                       T_INLINE_ELSE,
                      );
 
+        // Extend blacklist depending on which operator is being processed.
+        if ($tokens[$stackPtr]['code'] === T_LOGICAL_OR) {
+            $blackList[] = T_LOGICAL_XOR;
+        } else if ($tokens[$stackPtr]['code'] === T_LOGICAL_AND) {
+            $blackList[] = T_BOOLEAN_OR;
+        }
+
         $start = $phpcsFile->findStartOfStatement($stackPtr);
         $end   = $phpcsFile->findEndOfStatement($stackPtr);
 

CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.inc

@@ -49,4 +49,8 @@ $foo = ($a and ($b ?? $c) ?? $d);
 $foo = ($a and ($b ?? $c) or $d);
 $foo = ($a and ($b ?? $c) or $d ?? $e);
 
+$foo = ($a and $b || $c);
+$foo = ($a or $b xor $c);
+$foo = ($a and $b or $c);
+
 ?>

CodeSniffer/Standards/Squiz/Tests/Operators/ValidLogicalOperatorsUnitTest.php

@@ -67,6 +67,9 @@ public function getErrorList()
                 48 => 1,
                 49 => 2,
                 50 => 2,
+                52 => 1,
+                53 => 1,
+                54 => 2,
                );
 
     }//end getErrorList()