Fixed bug #2608 : PSR2 throws errors for use statements when multiple namespaces are defined in a file

Author: gsherwood

package.xml

@@ -181,6 +181,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #2575 : Custom error messages don't have data replaced when cache is enabled
   - Fixed bug #2601 : Squiz.WhiteSpace.FunctionSpacing incorrect fix when spacing is 0
+  - Fixed bug #2608 : PSR2 throws errors for use statements when multiple namespaces are defined in a file
  </notes>
  <contents>
   <dir name="/">

src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php

@@ -167,13 +167,7 @@ public function process(File $phpcsFile, $stackPtr)
 
         // Make sure this USE comes after the first namespace declaration.
         $prev = $phpcsFile->findPrevious(T_NAMESPACE, ($stackPtr - 1));
-        if ($prev !== false) {
-            $first = $phpcsFile->findNext(T_NAMESPACE, 1);
-            if ($prev !== $first) {
-                $error = 'USE declarations must go after the first namespace declaration';
-                $phpcsFile->addError($error, $stackPtr, 'UseAfterNamespace');
-            }
-        } else {
+        if ($prev === false) {
             $next = $phpcsFile->findNext(T_NAMESPACE, ($stackPtr + 1));
             if ($next !== false) {
                 $error = 'USE declarations must go after the namespace declaration';

src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php

@@ -34,7 +34,7 @@ public function getErrorList($testFile='')
                 5  => 1,
                 6  => 1,
                 7  => 1,
-                12 => 2,
+                12 => 1,
             ];
         case 'UseDeclarationUnitTest.3.inc':
             return [