Fixed bug #2095 : PSR2.Namespaces.NamespaceDeclaration does not handle namespaces defined over multiple lines

Author: gsherwood

package.xml

@@ -76,6 +76,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2065 : Generic.ControlStructures.InlineControlStructure fixing fails when inline control structure contains closure
   - Fixed bug #2072 : Squiz.Arrays.ArrayDeclaration throws NoComma error when array value is a shorthand IF statement
   - Fixed bug #2082 : File with "defined() or define()" syntax triggers PSR1.Files.SideEffects.FoundWithSymbols
+  - Fixed bug #2095 : PSR2.Namespaces.NamespaceDeclaration does not handle namespaces defined over multiple lines
  </notes>
  <contents>
   <dir name="/">

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

@@ -41,8 +41,9 @@ public function process(File $phpcsFile, $stackPtr)
     {
         $tokens = $phpcsFile->getTokens();
 
-        for ($i = ($stackPtr + 1); $i < ($phpcsFile->numTokens - 1); $i++) {
-            if ($tokens[$i]['line'] === $tokens[$stackPtr]['line']) {
+        $end = $phpcsFile->findEndOfStatement($stackPtr);
+        for ($i = ($end + 1); $i < ($phpcsFile->numTokens - 1); $i++) {
+            if ($tokens[$i]['line'] === $tokens[$end]['line']) {
                 continue;
             }
 

src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.inc

@@ -11,4 +11,12 @@ namespace Vendor\Package;
 
     use BarClass as Bar;
 
+namespace Vendor
+\Package;
+
+namespace Vendor\
+Package;
+namespace Vendor\
+
+Package;
 namespace Vendor\Package;

src/Standards/PSR2/Tests/Namespaces/NamespaceDeclarationUnitTest.inc.fixed

@@ -11,4 +11,14 @@ namespace Vendor\Package;
 
     use BarClass as Bar;
 
+namespace Vendor
+\Package;
+
+namespace Vendor\
+Package;
+
+namespace Vendor\
+
+Package;
+
 namespace Vendor\Package;

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

@@ -26,8 +26,10 @@ class NamespaceDeclarationUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            6 => 1,
-            9 => 1,
+            6  => 1,
+            9  => 1,
+            17 => 1,
+            19 => 1,
         ];
 
     }//end getErrorList()