Merge branch 'master' into 3.0

Author: gsherwood

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

@@ -144,3 +144,13 @@ switch($foo)
         break;
     }
 }
+
+switch ($foo) {
+    case Foo::INTERFACE:
+        return self::INTERFACE;
+    case Foo::NAMESPACE:
+        return self::MODULE;
+    case Foo::TRAIT:
+    case Foo::ARRAY:
+        return self::VALUE;
+}

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

@@ -147,3 +147,13 @@ switch($foo)
         break;
     }
 }
+
+switch ($foo) {
+    case Foo::INTERFACE:
+        return self::INTERFACE;
+    case Foo::NAMESPACE:
+        return self::MODULE;
+    case Foo::TRAIT:
+    case Foo::ARRAY:
+        return self::VALUE;
+}

src/Tokenizers/PHP.php

@@ -810,6 +810,30 @@ protected function tokenize($string)
                 continue;
             }
 
+            /*
+                Tokens after a double colon may be look like scope openers,
+                such as when writing code like Foo::NAMESAPCE, but they are
+                only ever variables or strings.
+            */
+
+            if ($stackPtr > 1
+                && $tokens[($stackPtr - 1)][0] === T_PAAMAYIM_NEKUDOTAYIM
+                && $tokenIsArray === true
+                && $token[0] !== T_STRING
+                && $token[0] !== T_VARIABLE
+                && $token[0] !== T_DOLLAR
+                && isset(Util\Tokens::$emptyTokens[$token[0]]) === false
+            ) {
+                $newToken            = array();
+                $newToken['code']    = T_STRING;
+                $newToken['type']    = 'T_STRING';
+                $newToken['content'] = $token[1];
+                $finalTokens[$newStackPtr] = $newToken;
+
+                $newStackPtr++;
+                continue;
+            }
+
             /*
                 Before PHP 7, the <=> operator was tokenized as
                 T_IS_SMALLER_OR_EQUAL followed by T_GREATER_THAN.
@@ -1398,25 +1422,6 @@ protected function processAdditional()
                         echo "\t* token $x on line $line changed from $type to T_STRING".PHP_EOL;
                     }
 
-                    $this->tokens[$x]['code'] = T_STRING;
-                    $this->tokens[$x]['type'] = 'T_STRING';
-                }
-            } else if ($this->tokens[$i]['code'] === T_PAAMAYIM_NEKUDOTAYIM) {
-                // Context sensitive keywords support.
-                for ($x = ($i + 1); $i < $numTokens; $x++) {
-                    if (isset(Util\Tokens::$emptyTokens[$this->tokens[$x]['code']]) === false) {
-                        // Non-whitespace content.
-                        break;
-                    }
-                }
-
-                if (in_array($this->tokens[$x]['code'], array(T_STRING, T_VARIABLE, T_DOLLAR), true) === false) {
-                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
-                        $line = $this->tokens[$x]['line'];
-                        $type = $this->tokens[$x]['type'];
-                        echo "\t* token $x on line $line changed from $type to T_STRING".PHP_EOL;
-                    }
-
                     $this->tokens[$x]['code'] = T_STRING;
                     $this->tokens[$x]['type'] = 'T_STRING';
                 }