SlevomatCodingStandard.Commenting.DocCommentSpacing: Some more fixes

Author: kukulich

SlevomatCodingStandard/Helpers/AnnotationHelper.php

@@ -25,14 +25,14 @@
 use PHPStan\PhpDocParser\Ast\Type\ObjectShapeItemNode;
 use PHPStan\PhpDocParser\Ast\Type\ObjectShapeNode;
 use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode;
+use function array_merge;
 use function count;
 use function in_array;
 use function sprintf;
 use function strlen;
 use function strtolower;
 use const T_DOC_COMMENT_STAR;
 use const T_DOC_COMMENT_STRING;
-use const T_DOC_COMMENT_TAG;
 use const T_DOC_COMMENT_WHITESPACE;
 
 /**
@@ -358,7 +358,7 @@ private static function getEndPointer(
 		while (true) {
 			$nextPointer = TokenHelper::findNext(
 				$phpcsFile,
-				[T_DOC_COMMENT_TAG, T_DOC_COMMENT_STRING],
+				array_merge(TokenHelper::$annotationTokenCodes, [T_DOC_COMMENT_STRING]),
 				$nextPointer + 1,
 				$parsedDocComment->getClosePointer()
 			);
@@ -367,7 +367,7 @@ private static function getEndPointer(
 				break;
 			}
 
-			if ($tokens[$nextPointer]['code'] === T_DOC_COMMENT_TAG) {
+			if (in_array($tokens[$nextPointer]['code'], TokenHelper::$annotationTokenCodes, true)) {
 				break;
 			}
 

SlevomatCodingStandard/Sniffs/Commenting/DocCommentSpacingSniff.php

@@ -17,6 +17,7 @@
 use function array_key_exists;
 use function array_keys;
 use function array_map;
+use function array_merge;
 use function array_values;
 use function asort;
 use function count;
@@ -139,7 +140,14 @@ public function process(File $phpcsFile, $docCommentOpenerPointer): void
 
 		$firstAnnotationPointer = $annotationsCount > 0 ? $annotations[0]->getStartPointer() : null;
 
-		$lastContentEndPointer = $annotationsCount > 0 ? $annotations[$annotationsCount - 1]->getEndPointer() : $firstContentEndPointer;
+		/** @var int $lastContentEndPointer */
+		$lastContentEndPointer = $annotationsCount > 0
+			? TokenHelper::findPrevious(
+				$phpcsFile,
+				array_merge(TokenHelper::$annotationTokenCodes, [T_DOC_COMMENT_STRING]),
+				$tokens[$docCommentOpenerPointer]['comment_closer'] - 1
+			)
+			: $firstContentEndPointer;
 
 		$this->checkLinesBeforeFirstContent($phpcsFile, $docCommentOpenerPointer, $firstContentStartPointer);
 		$this->checkLinesBetweenDescriptionAndFirstAnnotation(

tests/Sniffs/Commenting/DocCommentSpacingSniffTest.php

@@ -46,7 +46,7 @@ public function testDefaultSettingsErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/docCommentSpacingDefaultSettingsErrors.php');
 
-		self::assertSame(10, $report->getErrorCount());
+		self::assertSame(11, $report->getErrorCount());
 
 		self::assertSniffError($report, 5, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_FIRST_CONTENT);
 		self::assertSniffError($report, 26, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_FIRST_CONTENT);
@@ -62,6 +62,7 @@ public function testDefaultSettingsErrors(): void
 		self::assertSniffError($report, 42, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_LAST_CONTENT);
 
 		self::assertSniffError($report, 77, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_DIFFERENT_ANNOTATIONS_TYPES);
+		self::assertSniffError($report, 101, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_DIFFERENT_ANNOTATIONS_TYPES);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/Commenting/data/docCommentSpacingDefaultSettingsErrors.fixed.php

@@ -84,6 +84,7 @@ class Doctrine
 	 *                      lifetime: 600
 	 *                      cache_driver:
 	 *                          type: apc
+	 * @phpcs:enable
 	 */
 	public function method()
 	{

tests/Sniffs/Commenting/data/docCommentSpacingDefaultSettingsErrors.php

@@ -96,6 +96,9 @@ class Doctrine
 	 *                      lifetime: 600
 	 *                      cache_driver:
 	 *                          type: apc
+	 *
+	 *
+	 * @phpcs:enable
 	 */
 	public function method()
 	{

tests/Sniffs/Commenting/data/docCommentSpacingDefaultSettingsNoErrors.php

@@ -31,4 +31,17 @@ public function method()
 
 	}
 
+	/**
+	 * @group GH-6362
+	 *
+	 * SELECT a as base, b, c, d
+	 * FROM Start a
+	 * LEFT JOIN a.bases b
+	 * LEFT JOIN Child c WITH b.id = c.id
+	 * LEFT JOIN c.joins d
+	 */
+	public function descriptionAfterAnnotation()
+	{
+	}
+
 }