Merge branch 'feature/squiz-blockcomment-noblankline-after-php-open-t…

…ag' of https://github.com/jrfnl/PHP_CodeSniffer
squizlabs · Apr 16, 2019 · 4abd43e · 4abd43e
2 parents e1dcba4 + 134134e
commit 4abd43e
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php b/src/Standards/Squiz/Sniffs/Commenting/BlockCommentSniff.php
@@ -360,8 +360,9 @@ public function process(File $phpcsFile, $stackPtr)
 
         // Check that the lines before and after this comment are blank.
         $contentBefore = $phpcsFile->findPrevious(T_WHITESPACE, ($stackPtr - 1), null, true);
-        if (isset($tokens[$contentBefore]['scope_closer']) === true
-            && $tokens[$contentBefore]['scope_opener'] === $contentBefore
+        if ((isset($tokens[$contentBefore]['scope_closer']) === true
+            && $tokens[$contentBefore]['scope_opener'] === $contentBefore)
+            || $tokens[$contentBefore]['code'] === T_OPEN_TAG
         ) {
             if (($tokens[$stackPtr]['line'] - $tokens[$contentBefore]['line']) !== 1) {
                 $error = 'Empty line not required before block comment';

diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc
@@ -242,3 +242,17 @@ $y = 10 + /* test */ -2;
  * See: {@link https://github.com/squizlabs/PHP_CodeSniffer/issues/1918}
  * @phpcs:disable Standard.Category.Sniff
  */
+
+?>
+<?php
+/*
+ * No blank line required above the comment if it's the first non-empty token after a PHP open tag.
+ */
+
+?>
+<?php
+
+
+/*
+ * No blank line allowed above the comment if it's the first non-empty token after a PHP open tag.
+ */
diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc.fixed b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.inc.fixed
@@ -244,3 +244,17 @@ $y = 10 + /* test */ -2;
  * See: {@link https://github.com/squizlabs/PHP_CodeSniffer/issues/1918}
  * @phpcs:disable Standard.Category.Sniff
  */
+
+?>
+<?php
+/*
+ * No blank line required above the comment if it's the first non-empty token after a PHP open tag.
+ */
+
+?>
+<?php
+
+
+/*
+ * No blank line allowed above the comment if it's the first non-empty token after a PHP open tag.
+ */
diff --git a/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php b/src/Standards/Squiz/Tests/Commenting/BlockCommentUnitTest.php
@@ -41,6 +41,7 @@ public function setCliValues($testFile, $config)
     public function getErrorList()
     {
         $errors = [
+            3   => 1,
             8   => 1,
             20  => 1,
             24  => 1,
@@ -75,6 +76,7 @@ public function getErrorList()
             227 => 1,
             232 => 1,
             233 => 1,
+            256 => 1,
         ];
 
         return $errors;