Merge branch 'master' into 3.0

Author: gsherwood

package.xml

@@ -38,6 +38,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Added more guard code for syntax errors to various sniffs
   - Squiz CommentedOutCodeSniff is now better at ignoring URLs inside comments
   - Fixed bug #584 : Squiz.Arrays.ArrayDeclaration sniff gives incorrect NoComma error for multiline string values
+  - Fixed bug #592 : USE statement tokenising can sometimes result in mismatched scopes
   - Fixed bug #594 : Tokenizer issue on closure that returns by reference
  </notes>
  <contents>

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

@@ -88,4 +88,18 @@ switch (true) {
             return null;
         }
 }
-?>
+
+use Vendor\Test\FooBar;
+
+function test()
+{
+    switch ($val) {
+        case 'foo':
+            echo 'foo';
+            break;
+        default:
+            echo 'foo';
+    }
+
+    exit;
+}

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

@@ -88,4 +88,18 @@ switch (true) {
             return null;
         }
 }
-?>
+
+use Vendor\Test\FooBar;
+
+function test()
+{
+    switch ($val) {
+        case 'foo':
+            echo 'foo';
+            break;
+        default:
+            echo 'foo';
+    }
+
+    exit;
+}

src/Tokenizers/Tokenizer.php

@@ -451,6 +451,14 @@ private function createScopeMap()
                     echo "\tStart scope map at $i:$type => $content".PHP_EOL;
                 }
 
+                if (isset($this->tokens[$i]['scope_condition']) === true) {
+                    if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                        echo "\t* already processed, skipping *".PHP_EOL;
+                    }
+
+                    continue;
+                }
+
                 $i = $this->recurseScopeMap($i);
             }//end if
         }//end for