Merge pull request #1206 from PHPCSStandards/feature/1201-tokenizer-php-fqn-exit-die-true-false-null

Tokenizer/PHP: improved tokenization of fully qualified exit/die/true/false/null

Author: jrfnl

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

@@ -75,7 +75,7 @@ public function process(File $phpcsFile, $stackPtr)
         for (; $next <= $end; ++$next) {
             $code = $tokens[$next]['code'];
 
-            if (isset(Tokens::$emptyTokens[$code]) === true) {
+            if (isset(Tokens::$emptyTokens[$code]) === true || $code === T_NS_SEPARATOR) {
                 continue;
             } else if ($code !== T_TRUE && $code !== T_FALSE) {
                 $goodCondition = true;

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

@@ -164,6 +164,8 @@ public function isArrayStatic(File $phpcsFile, $arrayToken)
             T_COMMA        => T_COMMA,
             T_TRUE         => T_TRUE,
             T_FALSE        => T_FALSE,
+            T_NULL         => T_NULL,
+            T_NS_SEPARATOR => T_NS_SEPARATOR,
         ];
 
         for ($i = ($start + 1); $i < $end; $i++) {

src/Standards/Generic/Tests/CodeAnalysis/UnconditionalIfStatementUnitTest.1.inc

@@ -11,3 +11,8 @@ if (true) {
 if (file_exists(__FILE__) === true) {
 
 }
+
+// Check handling of case and FQN state.
+if (\true) {
+} else if (\FALSE) {
+}

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

@@ -50,9 +50,11 @@ public function getWarningList($testFile='')
         switch ($testFile) {
         case 'UnconditionalIfStatementUnitTest.1.inc':
             return [
-                3 => 1,
-                5 => 1,
-                7 => 1,
+                3  => 1,
+                5  => 1,
+                7  => 1,
+                16 => 1,
+                17 => 1,
             ];
 
         default:

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]
 ) {
 }
 
@@ -185,3 +185,14 @@ echo match ($text) {
 1 >= $value;
 1 <= $value;
 1 <=> $value;
+
+// 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

@@ -72,6 +72,10 @@ public function getErrorList()
             185 => 1,
             186 => 1,
             187 => 1,
+            191 => 1,
+            194 => 1,
+            195 => 2,
+            198 => 1,
         ];
 
     }//end getErrorList()

src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.1.inc

@@ -177,3 +177,7 @@ abstract class SkipOverPHP84AbstractProperties {
     abstract MyType|TRUE $propA {get;}
     protected abstract NULL|MyClass $propB {set;}
 }
+
+$a = \NULL;
+$a = \falSe;
+$a = \True;

src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.1.inc.fixed

@@ -177,3 +177,7 @@ abstract class SkipOverPHP84AbstractProperties {
     abstract MyType|TRUE $propA {get;}
     protected abstract NULL|MyClass $propB {set;}
 }
+
+$a = \null;
+$a = \false;
+$a = \true;

src/Standards/Generic/Tests/PHP/LowerCaseConstantUnitTest.php

@@ -70,6 +70,9 @@ public function getErrorList($testFile='')
                 169 => 1,
                 171 => 1,
                 173 => 1,
+                181 => 1,
+                182 => 1,
+                183 => 1,
             ];
 
         case 'LowerCaseConstantUnitTest.js':

src/Standards/Generic/Tests/PHP/UpperCaseConstantUnitTest.inc

@@ -118,3 +118,7 @@ abstract class SkipOverPHP84AbstractProperties {
     abstract MyType|true $propA {get;}
     protected abstract null|MyClass $propB {set;}
 }
+
+$a = \null;
+$a = \falSe;
+$a = \True;