PSR2/UseDeclaration: allow the fixer to function correctly with vario…

…us combinations of comments
squizlabs · Feb 17, 2018 · 1530543 · 1530543
1 parent bd96102
commit 1530543
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php b/src/Standards/PSR2/Sniffs/Namespaces/UseDeclarationSniff.php
@@ -157,6 +157,15 @@ public function process(File $phpcsFile, $stackPtr)
 
         --$end;
 
+        if (($tokens[$end]['code'] === T_COMMENT
+            || isset(Tokens::$phpcsCommentTokens[$tokens[$end]['code']]) === true)
+            && substr($tokens[$end]['content'], 0, 2) === '/*'
+            && substr($tokens[$end]['content'], -2) !== '*/'
+        ) {
+            // Multi-line block comments are not allowed as trailing comment after a use statement.
+            --$end;
+        }
+
         $next = $phpcsFile->findNext(T_WHITESPACE, ($end + 1), null, true);
 
         if ($next === false || $tokens[$next]['code'] === T_CLOSE_TAG) {