DocCommentSpacingSniff: Some errors were not reported

Author: kukulich

SlevomatCodingStandard/Sniffs/Commenting/DocCommentSpacingSniff.php

@@ -14,7 +14,6 @@
 use const T_DOC_COMMENT_STRING;
 use const T_DOC_COMMENT_WHITESPACE;
 use const T_WHITESPACE;
-use function array_combine;
 use function array_diff;
 use function array_flip;
 use function array_key_exists;
@@ -26,8 +25,8 @@
 use function explode;
 use function ksort;
 use function max;
+use function min;
 use function preg_match;
-use function range;
 use function sprintf;
 use function strlen;
 use function strpos;
@@ -494,10 +493,10 @@ private function checkAnnotationsGroupsOrder(
 		}
 
 		if (!$incorrectAnnotationsGroupsExist) {
-			$recalculatedAnnotationsGroupsPositions = array_combine(array_keys($annotationsGroupsPositions), range(0, count($annotationsGroupsPositions) - 1));
+			$positionDiff = min($annotationsGroupsPositions) - min(array_keys($annotationsGroupsPositions));
 
-			foreach ($recalculatedAnnotationsGroupsPositions as $annotationsGroupPosition => $sortedAnnotationsGroupPosition) {
-				if ($annotationsGroupPosition === $sortedAnnotationsGroupPosition) {
+			foreach ($annotationsGroupsPositions as $annotationsGroupPosition => $sortedAnnotationsGroupPosition) {
+				if ($annotationsGroupPosition === $sortedAnnotationsGroupPosition - $positionDiff) {
 					continue;
 				}
 

tests/Sniffs/Commenting/DocCommentSpacingSniffTest.php

@@ -119,6 +119,7 @@ public function testAnnotationsGroupsErrors(): void
 		$report = self::checkFile(__DIR__ . '/data/docCommentSpacingAnnotationsGroupsErrors.php', [
 			'linesCountBetweenAnnotationsGroups' => 1,
 			'annotationsGroups' => [
+				'@dataProvider',
 				'@param',
 				'@X\\Boo,@X\\,@XX',
 				'@throws',
@@ -133,12 +134,13 @@ public function testAnnotationsGroupsErrors(): void
 			DocCommentSpacingSniff::CODE_INCORRECT_ORDER_OF_ANNOTATIONS_IN_GROUP,
 		]);
 
-		self::assertSame(4, $report->getErrorCount());
+		self::assertSame(5, $report->getErrorCount());
 
 		self::assertSniffError($report, 20, DocCommentSpacingSniff::CODE_INCORRECT_ANNOTATIONS_GROUP);
 		self::assertSniffError($report, 34, DocCommentSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_ANNOTATIONS_GROUPS);
 		self::assertSniffError($report, 46, DocCommentSpacingSniff::CODE_INCORRECT_ORDER_OF_ANNOTATIONS_GROUPS);
 		self::assertSniffError($report, 49, DocCommentSpacingSniff::CODE_INCORRECT_ORDER_OF_ANNOTATIONS_IN_GROUP);
+		self::assertSniffError($report, 62, DocCommentSpacingSniff::CODE_INCORRECT_ORDER_OF_ANNOTATIONS_GROUPS);
 
 		self::assertAllFixedInFile($report);
 	}

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

@@ -57,4 +57,16 @@ public function anotherMethod()
 
 	}
 
+	/**
+	 * @dataProvider oneMoreMethodData
+	 *
+	 * @param int $a
+	 * @param int|null $b
+	 * @param string $c
+	 */
+	public function oneMoreMethod($a, $b, $c)
+	{
+
+	}
+
 }

tests/Sniffs/Commenting/data/docCommentSpacingAnnotationsGroupsErrors.php

@@ -58,4 +58,16 @@ public function anotherMethod()
 
 	}
 
+	/**
+	 * @param int $a
+	 * @param int|null $b
+	 * @param string $c
+	 *
+	 * @dataProvider oneMoreMethodData
+	 */
+	public function oneMoreMethod($a, $b, $c)
+	{
+
+	}
+
 }