FunctionCommentSniff: sync with upstream to fix attributes support

Author: javer

Swivl/Sniffs/Commenting/FunctionCommentSniff.php

@@ -54,9 +54,24 @@ public function process(File $phpcsFile, $stackPtr)
 
         $tokens = $phpcsFile->getTokens();
         $ignore = Tokens::$methodPrefixes;
-        $ignore[] = T_WHITESPACE;
+        $ignore[T_WHITESPACE] = T_WHITESPACE;
+
+        for ($commentEnd = ($stackPtr - 1); $commentEnd >= 0; $commentEnd--) {
+            if (isset($ignore[$tokens[$commentEnd]['code']]) === true) {
+                continue;
+            }
+
+            if (
+                $tokens[$commentEnd]['code'] === T_ATTRIBUTE_END
+                && isset($tokens[$commentEnd]['attribute_opener']) === true
+            ) {
+                $commentEnd = $tokens[$commentEnd]['attribute_opener'];
+                continue;
+            }
+
+            break;
+        }
 
-        $commentEnd = $phpcsFile->findPrevious($ignore, ($stackPtr - 1), null, true);
         if ($tokens[$commentEnd]['code'] === T_COMMENT) {
             // Inline comments might just be closing comments for
             // control structures or functions instead of function comments
@@ -102,8 +117,20 @@ public function process(File $phpcsFile, $stackPtr)
         }
 
         if ($tokens[$commentEnd]['line'] !== ($tokens[$stackPtr]['line'] - 1)) {
-            $error = 'There must be no blank lines after the function comment';
-            $phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
+            for ($i = ($commentEnd + 1); $i < $stackPtr; $i++) {
+                if ($tokens[$i]['column'] !== 1) {
+                    continue;
+                }
+
+                if (
+                    $tokens[$i]['code'] === T_WHITESPACE
+                    && $tokens[$i]['line'] !== $tokens[($i + 1)]['line']
+                ) {
+                    $error = 'There must be no blank lines after the function comment';
+                    $phpcsFile->addError($error, $commentEnd, 'SpacingAfter');
+                    break;
+                }
+            }
         }
 
         $commentStart = $tokens[$commentEnd]['comment_opener'];