Fixed bug #1876 : PSR2.Namespaces.UseDeclaration not giving error for…

… use statements before the namespace declaration
squizlabs · Mar 19, 2018 · c75c6ae · jrfnl · Mar 19, 2018 · gsherwood
1 parent 78ddbae
commit c75c6ae
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/package.xml b/package.xml
@@ -82,6 +82,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz.PHP.CommentedOutCode now ignores a greater number of short comments so they are not flagged as commented out code
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #1863 : File::findEndOfStatement() not working when passed a scope opener
+  - Fixed bug #1876 : PSR2.Namespaces.UseDeclaration not giving error for use statements before the namespace declaration
+    -- Adds a new PSR2.Namespaces.UseDeclaration.UseBeforeNamespace error message
   - Fixed bug #1915 : JS tokenizer fails to tokenize regular expression proceeded by boolean not operator
   - Fixed bug #1922 : Equal sign alignment check broken when list syntax used before assignment operator
   - Fixed bug #1925 : Generic.Formatting.MultipleStatementAlignment skipping assignments within closures
@@ -1039,6 +1041,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP/CodeSniffer" name="UseDeclarationUnitTest.13.inc.fixed" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="UseDeclarationUnitTest.14.inc" role="test" />
         <file baseinstalldir="PHP/CodeSniffer" name="UseDeclarationUnitTest.14.inc.fixed" role="test" />
+        <file baseinstalldir="PHP/CodeSniffer" name="UseDeclarationUnitTest.15.inc" role="test" />
        </dir>
       </dir>
       <file baseinstalldir="PHP/CodeSniffer" name="ruleset.xml" role="php" />

diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -122,6 +122,12 @@ public function process(File $phpcsFile, $stackPtr)
                 $error = 'USE declarations must go after the first namespace declaration';
                 $phpcsFile->addError($error, $stackPtr, 'UseAfterNamespace');
             }
+        } else {
+            $next = $phpcsFile->findNext(T_NAMESPACE, ($stackPtr + 1));
+            if ($next !== false) {
+                $error = 'USE declarations must go after the namespace declaration';
+                $phpcsFile->addError($error, $stackPtr, 'UseBeforeNamespace');
+            }
         }
 
         // Only interested in the last USE statement from here onwards.

diff --git a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.15.inc b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.15.inc
@@ -0,0 +1,10 @@
+<?php
+
+use BarClass as Bar;
+use My\Full\Classname as Another;
+use ArrayObject;
+
+namespace AnotherProject;
+
+$foo = 'bar';
+
diff --git a/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php b/src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.php
@@ -55,6 +55,12 @@ public function getErrorList($testFile='')
         case 'UseDeclarationUnitTest.13.inc':
         case 'UseDeclarationUnitTest.14.inc':
             return [2 => 1];
+        case 'UseDeclarationUnitTest.15.inc':
+            return [
+                3 => 1,
+                4 => 1,
+                5 => 1,
+            ];
         default:
             return [];
         }//end switch