Merge branch 'hotfix/7'

Close #7
webimpress · May 10, 2019 · 6b788d1 · 6b788d1
2 parents d73bece + c559502
commit 6b788d1
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#6](https://github.com/webimpress/coding-standard/pull/6) `Commenting\Placement` - fixes false-positive when space was required before comment in next line after PHP open tag
 
+- [#7](https://github.com/webimpress/coding-standard/pull/7) `Commenting\DocComment` - fixes false-positive when new line was required before doc-block
+
 ## 1.0.0 - 2019-03-07
 
 Initial release.

diff --git a/src/WebimpressCodingStandard/Sniffs/Commenting/DocCommentSniff.php b/src/WebimpressCodingStandard/Sniffs/Commenting/DocCommentSniff.php
@@ -31,6 +31,8 @@
 use const T_DOC_COMMENT_WHITESPACE;
 use const T_NAMESPACE;
 use const T_OPEN_CURLY_BRACKET;
+use const T_OPEN_PARENTHESIS;
+use const T_OPEN_SHORT_ARRAY;
 use const T_OPEN_TAG;
 use const T_USE;
 use const T_WHITESPACE;
@@ -182,8 +184,12 @@ private function checkBeforeOpen(File $phpcsFile, int $commentStart) : void
                 $phpcsFile->fixer->endChangeset();
             }
         } elseif ($tokens[$previous]['line'] === $tokens[$commentStart]['line'] - 1
-            && $tokens[$previous]['code'] !== T_OPEN_TAG
-            && $tokens[$previous]['code'] !== T_OPEN_CURLY_BRACKET
+            && ! in_array($tokens[$previous]['code'], [
+                T_OPEN_CURLY_BRACKET,
+                T_OPEN_PARENTHESIS,
+                T_OPEN_SHORT_ARRAY,
+                T_OPEN_TAG,
+            ], true)
         ) {
             $error = 'Missing blank line before doc comment';
             $fix = $phpcsFile->addFixableError($error, $commentStart, 'MissingBlankLine');

diff --git a/test/Sniffs/Commenting/DocCommentUnitTest.inc b/test/Sniffs/Commenting/DocCommentUnitTest.inc
@@ -260,4 +260,30 @@ class Foo
      *           bar baz
      */
     public function descriptionIndentWithTags() {}
+
+    public function docCommentInArray() : array
+    {
+        return [
+            /**
+             * @param mixed $a
+             * @return mixed
+             */
+            static function ($a) {
+                return $a;
+            },
+        ];
+    }
+
+    public function docCommentInFunctionCall() : callable
+    {
+        $this->getName(
+            /**
+             * @param mixed $a
+             * @return mixed
+             */
+            static function ($a) {
+                return $a;
+            }
+        );
+    }
 }
diff --git a/test/Sniffs/Commenting/DocCommentUnitTest.inc.fixed b/test/Sniffs/Commenting/DocCommentUnitTest.inc.fixed
@@ -262,4 +262,30 @@ $c = 'xyz';
      *     bar baz
      */
     public function descriptionIndentWithTags() {}
+
+    public function docCommentInArray() : array
+    {
+        return [
+            /**
+             * @param mixed $a
+             * @return mixed
+             */
+            static function ($a) {
+                return $a;
+            },
+        ];
+    }
+
+    public function docCommentInFunctionCall() : callable
+    {
+        $this->getName(
+            /**
+             * @param mixed $a
+             * @return mixed
+             */
+            static function ($a) {
+                return $a;
+            }
+        );
+    }
 }