Merge branch 'master' into 4.x

Author: jrfnl

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

@@ -77,13 +77,6 @@ public function process(File $phpcsFile, $stackPtr)
 
             if (isset(Tokens::EMPTY_TOKENS[$code]) === true) {
                 continue;
-            }
-
-            if ($code === T_NAME_FULLY_QUALIFIED) {
-                $compareReadyKeyword = strtolower($tokens[$next]['content']);
-                if ($compareReadyKeyword !== '\true' && $compareReadyKeyword !== '\false') {
-                    $goodCondition = true;
-                }
             } else if ($code !== T_TRUE && $code !== T_FALSE) {
                 $goodCondition = true;
             }

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

@@ -55,24 +55,12 @@ 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) {
@@ -185,21 +173,10 @@ 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/Sniffs/PHP/LowerCaseConstantSniff.php

@@ -60,9 +60,6 @@ public function register()
     {
         $targets = $this->targets;
 
-        // Allow for "fully qualified" true/false/null.
-        $targets[] = T_NAME_FULLY_QUALIFIED;
-
         // Register scope modifiers to filter out property type declarations.
         $targets  += Tokens::SCOPE_MODIFIERS;
         $targets[] = T_VAR;
@@ -99,13 +96,6 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        // If this is a fully qualified name, check if it is FQN true/false/null.
-        if ($tokens[$stackPtr]['code'] === T_NAME_FULLY_QUALIFIED
-            && $this->isFQNTrueFalseNull($phpcsFile, $stackPtr) === false
-        ) {
-            return;
-        }
-
         // Skip over potential type declarations for constants.
         if ($tokens[$stackPtr]['code'] === T_CONST) {
             // Constant must always have a value assigned to it, so we can just look for the assignment
@@ -190,10 +180,7 @@ public function process(File $phpcsFile, $stackPtr)
                 }
 
                 for ($i = $param['default_token']; $i < $paramEnd; $i++) {
-                    if (isset($this->targets[$tokens[$i]['code']]) === true
-                        || ($tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED
-                        && $this->isFQNTrueFalseNull($phpcsFile, $i) === true)
-                    ) {
+                    if (isset($this->targets[$tokens[$i]['code']]) === true) {
                         $this->processConstant($phpcsFile, $i);
                     }
                 }
@@ -209,28 +196,6 @@ public function process(File $phpcsFile, $stackPtr)
     }//end process()
 
 
-    /**
-     * Check if a fully qualified name is a fully qualified true/false/null.
-     *
-     * @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.
-     * @param int                         $stackPtr  The position of the T_NAME_FULLY_QUALIFIED token in the
-     *                                               stack passed in $tokens.
-     *
-     * @return bool
-     */
-    protected function isFQNTrueFalseNull(File $phpcsFile, $stackPtr)
-    {
-        $tokens = $phpcsFile->getTokens();
-
-        // Check for fully qualified true/false/null only.
-        $compareReadyKeyword = strtolower($tokens[$stackPtr]['content']);
-        return ($compareReadyKeyword === '\true'
-            || $compareReadyKeyword === '\false'
-            || $compareReadyKeyword === '\null');
-
-    }//end isFQNTrueFalseNull()
-
-
     /**
      * Processes a non-type declaration constant.
      *

src/Standards/PEAR/Sniffs/Functions/ValidDefaultValueSniff.php

@@ -54,11 +54,14 @@ public function process(File $phpcsFile, $stackPtr)
             }
 
             if (array_key_exists('default', $param) === true) {
-                $defaultFound = true;
+                $defaultFound   = true;
+                $defaultValueLc = strtolower($param['default']);
                 // Check if the arg is type hinted and using NULL for the default.
                 // This does not make the argument optional - it just allows NULL
                 // to be passed in.
-                if ($param['type_hint'] !== '' && strtolower($param['default']) === 'null') {
+                if ($param['type_hint'] !== ''
+                    && ($defaultValueLc === 'null' || $defaultValueLc === '\null')
+                ) {
                     $defaultFound = false;
                 }
 

src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.1.inc

@@ -114,3 +114,7 @@ class ConstructorPropertyPromotionMixedWithNormalParams {
         mixed $requiredParam,
     ) {}
 }
+
+// Safeguard correct handling of FQN null as default value.
+function foo(Foo $foo = \null, $bar) {}
+function foo(Foo $foo = \null, Foz $foz = \NULL, $bar = true, $baz) {}

src/Standards/PEAR/Tests/Functions/ValidDefaultValueUnitTest.php

@@ -46,6 +46,7 @@ public function getErrorList($testFile='')
                 101 => 1,
                 106 => 1,
                 114 => 1,
+                120 => 1,
             ];
 
         default:

src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

@@ -252,7 +252,7 @@ switch ($sContext)
     case 'SOMETHING':
     case 'CONSTANT':
         do_something();
-        break;
+        \exit();
     case 'GLOBAL':
     case 'GLOBAL1':
         do_something();

src/Standards/PSR2/Tests/ControlStructures/SwitchDeclarationUnitTest.inc.fixed

@@ -255,7 +255,7 @@ switch ($sContext)
     case 'SOMETHING':
     case 'CONSTANT':
         do_something();
-        break;
+        \exit();
     case 'GLOBAL':
     case 'GLOBAL1':
         do_something();

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

@@ -174,13 +174,6 @@ public function process(File $phpcsFile, $stackPtr)
                 $foundBooleans++;
             }
 
-            if ($tokens[$i]['code'] === T_NAME_FULLY_QUALIFIED) {
-                $compareReadyKeyword = strtolower($tokens[$i]['content']);
-                if ($compareReadyKeyword === '\true' || $compareReadyKeyword === '\false') {
-                    $foundBooleans++;
-                }
-            }
-
             if ($tokens[$i]['code'] === T_BOOLEAN_AND
                 || $tokens[$i]['code'] === T_BOOLEAN_OR
             ) {

src/Standards/Squiz/Tests/ControlStructures/SwitchDeclarationUnitTest.inc

@@ -58,7 +58,7 @@ case '3':
     break;
 case '4':
     $case = '4';
-    break;
+    \exit;
 default:
     $case = null;
     break;