Generic/DisallowYodaConditions: handle FQN true/false/null

This commit fixes the sniff to handle "fully qualified true/false" the same as unqualified true/false after the merge of 1020.

Includes tests.

Author: jrfnl

src/Standards/Generic/Sniffs/ControlStructures/DisallowYodaConditionsSniff.php

@@ -55,12 +55,24 @@ public function process(File $phpcsFile, $stackPtr)
             T_LNUMBER,
             T_DNUMBER,
             T_CONSTANT_ENCAPSED_STRING,
+            T_NAME_FULLY_QUALIFIED,
         ];
 
         if (in_array($tokens[$previousIndex]['code'], $relevantTokens, true) === false) {
             return;
         }
 
+        // Special case: T_NAME_FULLY_QUALIFIED is only a "relevant" token when it is for a FQN true/false/null.
+        if ($tokens[$previousIndex]['code'] === T_NAME_FULLY_QUALIFIED) {
+            $compareReadyKeyword = strtolower($tokens[$previousIndex]['content']);
+            if ($compareReadyKeyword !== '\true'
+                && $compareReadyKeyword !== '\false'
+                && $compareReadyKeyword !== '\null'
+            ) {
+                return;
+            }
+        }
+
         if ($tokens[$previousIndex]['code'] === T_CLOSE_SHORT_ARRAY) {
             $previousIndex = $tokens[$previousIndex]['bracket_opener'];
             if ($this->isArrayStatic($phpcsFile, $previousIndex) === false) {
@@ -164,6 +176,7 @@ public function isArrayStatic(File $phpcsFile, $arrayToken)
             T_COMMA        => T_COMMA,
             T_TRUE         => T_TRUE,
             T_FALSE        => T_FALSE,
+            T_NULL         => T_NULL,
         ];
 
         for ($i = ($start + 1); $i < $end; $i++) {
@@ -172,10 +185,21 @@ public function isArrayStatic(File $phpcsFile, $arrayToken)
                 continue;
             }
 
+            // Special case: T_NAME_FULLY_QUALIFIED is only a "static" token when it is for a FQN true/false/null.
+            if ($tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED) {
+                $compareReadyKeyword = strtolower($tokens[$i]['content']);
+                if ($compareReadyKeyword === '\true'
+                    || $compareReadyKeyword === '\false'
+                    || $compareReadyKeyword === '\null'
+                ) {
+                    continue;
+                }
+            }
+
             if (isset($staticTokens[$tokens[$i]['code']]) === false) {
                 return false;
             }
-        }
+        }//end for
 
         return true;
 

src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.inc

@@ -7,8 +7,8 @@ if ($value == true) {}
 if (true === $value) {}
 if (true == $value) {}
 
-if($value === true){}
-if($value == true){}
+if($value === false){}
+if($value == false){}
 if(false === $value){}
 if(!false == $value || true !== $value){}
 
@@ -139,8 +139,8 @@ if (is_array($val)
     && array('foo', 'bar') === array($foo, $bar)
     && ['foo', 'bar'] === [$foo, $bar]
     && array('foo' => true, 'bar' => false) === array(getContents())
-    && ['foo' => true, 'bar' => false] === array(getContents())
-    && array(getContents()) === ['foo' => true, 'bar' => false]
+    && ['foo' => true, 'bar' => \false, 'baz' => null] === array(getContents())
+    && array(getContents()) === ['foo' => \true, 'bar' => false, 'baz' => \null]
 ) {
 }
 
@@ -192,3 +192,14 @@ if(Partially\qualified('foo') === 10){}
 if(1.5 === Partially\qualified(true)){}
 if(namespace\relative(false) === null){}
 if('string' === namespace\relative(null)){}
+
+// Handle FQN true/false/null the same as plain true/false/null.
+if ($value === \true) {}
+if (\true === $value) {}
+
+if($value == \FALSE){}
+if(\FALSE === $value){}
+if(!\false == $value || true !== $value){}
+
+if($value === \Null){}
+if(\Null == $value){}

src/Standards/Generic/Tests/ControlStructures/DisallowYodaConditionsUnitTest.php

@@ -75,6 +75,10 @@ public function getErrorList()
             190 => 1,
             192 => 1,
             194 => 1,
+            198 => 1,
+            201 => 1,
+            202 => 2,
+            205 => 1,
         ];
 
     }//end getErrorList()