Squiz ComparisonOperatorUsageSniff now allows conditions like while(true)

Author: gsherwood

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

@@ -184,6 +184,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
         $requiredOps = 0;
         $foundOps    = 0;
+        $foundBools  = 0;
 
         for ($i = $start; $i <= $end; $i++) {
             $type = $tokens[$i]['code'];
@@ -199,36 +200,42 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $foundOps++;
             }
 
-            if ($phpcsFile->tokenizerType !== 'JS') {
-                if ($tokens[$i]['code'] === T_BOOLEAN_AND || $tokens[$i]['code'] === T_BOOLEAN_OR) {
-                    $requiredOps++;
+            if ($tokens[$i]['code'] === T_TRUE || $tokens[$i]['code'] === T_FALSE) {
+                $foundBools++;
+            }
 
-                    // When the instanceof operator is used with another operator
-                    // like ===, you can get more ops than are required.
-                    if ($foundOps > $requiredOps) {
-                        $foundOps = $requiredOps;
-                    }
+            if ($phpcsFile->tokenizerType !== 'JS'
+                && ($tokens[$i]['code'] === T_BOOLEAN_AND
+                || $tokens[$i]['code'] === T_BOOLEAN_OR)
+            ) {
+                $requiredOps++;
 
-                    // If we get to here and we have not found the right number of
-                    // comparison operators, then we must have had an implicit
-                    // true operation ie. if ($a) instead of the required
-                    // if ($a === true), so let's add an error.
-                    if ($requiredOps !== $foundOps) {
-                        $error = 'Implicit true comparisons prohibited; use === TRUE instead';
-                        $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
-                        $foundOps++;
-                    }
+                // When the instanceof operator is used with another operator
+                // like ===, you can get more ops than are required.
+                if ($foundOps > $requiredOps) {
+                    $foundOps = $requiredOps;
                 }
-            }//end if
+
+                // If we get to here and we have not found the right number of
+                // comparison operators, then we must have had an implicit
+                // true operation i.e., if ($a) instead of the required
+                // if ($a === true), so let's add an error.
+                if ($requiredOps !== $foundOps) {
+                    $error = 'Implicit true comparisons prohibited; use === TRUE instead';
+                    $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
+                    $foundOps++;
+                }
+            }
         }//end for
 
         $requiredOps++;
 
-        if ($phpcsFile->tokenizerType !== 'JS') {
-            if ($foundOps < $requiredOps) {
-                $error = 'Implicit true comparisons prohibited; use === TRUE instead';
-                $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
-            }
+        if ($phpcsFile->tokenizerType !== 'JS'
+            && $foundOps < $requiredOps
+            && ($requiredOps !== $foundBools)
+        ) {
+            $error = 'Implicit true comparisons prohibited; use === TRUE instead';
+            $phpcsFile->addError($error, $stackPtr, 'ImplicitTrue');
         }
 
     }//end process()

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

@@ -111,3 +111,9 @@ for ($var1 = 10; $var1 !== 0; $var1--) {
 
 for ($var1 = ($var2 === 10); $var1; $var1--) {
 }
+
+while (TRUE) {
+}
+
+while (FALSE) {
+}

package.xml

@@ -50,6 +50,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Please update your ruleset if you are referencing this error code directly
   - Squiz CSS IndentationSniff no longer assumes the class opening brace is at the end of a line
   - Squiz FunctionCommentThrowTagSniff now ignores non-docblock comments
+  - Squiz ComparisonOperatorUsageSniff now allows conditions like while(true)
   - Fixed bug #872 : Incorrect detection of blank lines between CSS class names
  </notes>
  <contents>