NamespaceSpacingSniff: fixed when namespace is after line comment

Author: kukulich

SlevomatCodingStandard/Sniffs/Namespaces/NamespaceSpacingSniff.php

@@ -49,6 +49,8 @@ private function checkLinesBeforeNamespace(\PHP_CodeSniffer\Files\File $phpcsFil
 
 		if ($tokens[$pointerBeforeNamespace]['code'] === T_OPEN_TAG) {
 			$whitespaceBeforeNamespace .= substr($tokens[$pointerBeforeNamespace]['content'], strlen('<?php'));
+		} elseif ($tokens[$pointerBeforeNamespace]['code'] === T_COMMENT) {
+			$whitespaceBeforeNamespace .= $phpcsFile->eolChar;
 		}
 
 		if ($pointerBeforeNamespace + 1 !== $namespacePointer) {
@@ -80,6 +82,8 @@ private function checkLinesBeforeNamespace(\PHP_CodeSniffer\Files\File $phpcsFil
 
 		if ($tokens[$pointerBeforeNamespace]['code'] === T_OPEN_TAG) {
 			$phpcsFile->fixer->replaceToken($pointerBeforeNamespace, '<?php');
+		} elseif ($tokens[$pointerBeforeNamespace]['code'] === T_COMMENT) {
+			$phpcsFile->fixer->replaceToken($pointerBeforeNamespace, rtrim($tokens[$pointerBeforeNamespace]['content'], $phpcsFile->eolChar));
 		}
 
 		for ($i = $pointerBeforeNamespace + 1; $i < $namespacePointer; $i++) {

tests/Sniffs/Namespaces/NamespaceSpacingSniffTest.php

@@ -52,6 +52,23 @@ public function testAfterOpenTagErrors(): void
 		self::assertAllFixedInFile($report);
 	}
 
+	public function testAfterLineCommentNoErrors(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/namespaceSpacingAfterLineCommentNoErrors.php');
+		self::assertNoSniffErrorInFile($report);
+	}
+
+	public function testAfterLineCommentErrors(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/namespaceSpacingAfterLineCommentErrors.php');
+
+		self::assertSame(1, $report->getErrorCount());
+
+		self::assertSniffError($report, 4, NamespaceSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_NAMESPACE);
+
+		self::assertAllFixedInFile($report);
+	}
+
 	public function testModifiedSettingsNoErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/namespaceSpacingWithModifiedSettingsNoErrors.php', [

tests/Sniffs/Namespaces/data/namespaceSpacingAfterLineCommentErrors.fixed.php

@@ -0,0 +1,10 @@
+<?php
+
+// Comment
+
+namespace Something;
+
+class Whatever
+{
+
+}

tests/Sniffs/Namespaces/data/namespaceSpacingAfterLineCommentErrors.php

@@ -0,0 +1,9 @@
+<?php
+
+// Comment
+namespace Something;
+
+class Whatever
+{
+
+}

tests/Sniffs/Namespaces/data/namespaceSpacingAfterLineCommentNoErrors.php

@@ -0,0 +1,10 @@
+<?php
+
+// Comment
+
+namespace Something;
+
+class Whatever
+{
+
+}