Prove regression from #1893

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

@@ -137,12 +137,19 @@ public function process(File $phpcsFile, $stackPtr)
             return;
         }
 
-        $end = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
+        $end         = $phpcsFile->findNext(T_SEMICOLON, ($stackPtr + 1));
+        $nextComment = $phpcsFile->findNext(T_COMMENT, ($end + 1));
+
+        // The end of the line is allowed to be a comment as well as a semi colon.
+        if ($nextComment !== false && $tokens[$nextComment]['line'] === $tokens[$end]['line']) {
+            $end = $nextComment;
+        }
+
         if ($end === false) {
             return;
         }
 
-        $next = $phpcsFile->findNext(Tokens::$emptyTokens, ($end + 1), null, true);
+        $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true);
 
         if ($next === false || $tokens[$next]['code'] === T_CLOSE_TAG) {
             return;

src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.10.inc

@@ -0,0 +1,8 @@
+<?php
+use Foo\Bar; // trailing comment
+// This should fail.
+
+class Baz
+{
+
+}

src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.10.inc.fixed

@@ -0,0 +1,9 @@
+<?php
+use Foo\Bar; // trailing comment
+
+// This should fail.
+
+class Baz
+{
+
+}

src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.8.inc

@@ -1,4 +1,8 @@
 <?php
-use Foo\Bar; //comment
+use Foo\Bar;
 
 // This should pass.
+class Baz
+{
+
+}

src/Standards/PSR2/Tests/Namespaces/UseDeclarationUnitTest.9.inc

@@ -0,0 +1,8 @@
+<?php
+use Foo\Bar; // trailing comment
+
+// This should pass.
+class Baz
+{
+
+}

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

@@ -49,6 +49,8 @@ public function getErrorList($testFile='')
                 18 => 1,
                 19 => 1,
             ];
+        case 'UseDeclarationUnitTest.10.inc':
+            return [2 => 1];
         default:
             return [];
         }//end switch