Merge branch 'hotfix/18' into develop

Forward port #18
webimpress · May 14, 2019 · 95e282e · 95e282e
2 parents 5cba734 + 74fb3da
commit 95e282e
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -53,6 +53,8 @@ All notable changes to this project will be documented in this file, in reverse
     - `PHP\CorrectClassNameCase` - fixes caps in class/interface names used within the tag,
     - `PHP\DisallowFqn` - imports FQN used within the tag.
 
+- [#18](https://github.com/webimpress/coding-standard/pull/18) `Commenting\DocComment` - fixes requiring content straight after doc-block - allows empty line when next content is another doc-block
+
 ## 1.0.2 - 2019-05-12
 
 ### Added

diff --git a/src/WebimpressCodingStandard/Sniffs/Commenting/DocCommentSniff.php b/src/WebimpressCodingStandard/Sniffs/Commenting/DocCommentSniff.php
@@ -269,6 +269,7 @@ private function checkAfterClose(File $phpcsFile, int $commentStart, int $commen
         $allowEmptyLineBefore = [
             T_NAMESPACE,
             T_USE,
+            T_DOC_COMMENT_OPEN_TAG,
         ];
 
         $prev = $phpcsFile->findPrevious(T_WHITESPACE, $commentStart - 1, null, true);

diff --git a/test/Sniffs/Commenting/DocCommentUnitTest.inc b/test/Sniffs/Commenting/DocCommentUnitTest.inc
@@ -286,4 +286,15 @@ class Foo
             }
         );
     }
+
+    /**
+     * FIRST DOC-BLOCK COMMENT
+     */
+
+    /**
+     * Method doc-block
+     */
+    public function allowSpaceBetweenTwoPhpDocBlock()
+    {
+    }
 }
diff --git a/test/Sniffs/Commenting/DocCommentUnitTest.inc.fixed b/test/Sniffs/Commenting/DocCommentUnitTest.inc.fixed
@@ -288,4 +288,15 @@ $c = 'xyz';
             }
         );
     }
+
+    /**
+     * FIRST DOC-BLOCK COMMENT
+     */
+
+    /**
+     * Method doc-block
+     */
+    public function allowSpaceBetweenTwoPhpDocBlock()
+    {
+    }
 }