SlevomatCodingStandard.Classes.MethodSpacing: Fix check for method with attributes

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/MethodSpacingSniff.php

@@ -14,6 +14,7 @@
 use function array_key_exists;
 use function sprintf;
 use function str_repeat;
+use const T_ATTRIBUTE;
 use const T_FUNCTION;
 use const T_SEMICOLON;
 
@@ -62,17 +63,29 @@ public function process(File $phpcsFile, $methodPointer): void
 			return;
 		}
 
+		$nextMethodAttributeStartPointer = null;
 		$nextMethodDocCommentStartPointer = DocCommentHelper::findDocCommentOpenPointer($phpcsFile, $nextMethodPointer);
+
 		if (
 			$nextMethodDocCommentStartPointer !== null
 			&& $tokens[$tokens[$nextMethodDocCommentStartPointer]['comment_closer']]['line'] + 1 !== $tokens[$nextMethodPointer]['line']
 		) {
 			$nextMethodDocCommentStartPointer = null;
+		} else {
+			$nextMethodAttributeStartPointer = TokenHelper::findPrevious(
+				$phpcsFile,
+				T_ATTRIBUTE,
+				$nextMethodPointer - 1,
+				$methodEndPointer
+			);
 		}
 
 		$nextMethodFirstLinePointer = $tokens[$nextMethodPointer]['line'] === $tokens[$methodEndPointer]['line']
 			? TokenHelper::findNextEffective($phpcsFile, $methodEndPointer + 1)
-			: TokenHelper::findFirstTokenOnLine($phpcsFile, $nextMethodDocCommentStartPointer ?? $nextMethodPointer);
+			: TokenHelper::findFirstTokenOnLine(
+				$phpcsFile,
+				$nextMethodDocCommentStartPointer ?? $nextMethodAttributeStartPointer ?? $nextMethodPointer
+			);
 
 		if (TokenHelper::findNextNonWhitespace($phpcsFile, $methodEndPointer + 1, $nextMethodFirstLinePointer) !== null) {
 			return;

tests/Sniffs/Classes/MethodSpacingSniffTest.php

@@ -17,7 +17,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/methodSpacingErrors.php');
 
-		self::assertSame(5, $report->getErrorCount());
+		self::assertSame(6, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -49,6 +49,12 @@ public function testErrors(): void
 			MethodSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_METHODS,
 			'Expected 1 blank line after method, found 2.'
 		);
+		self::assertSniffError(
+			$report,
+			50,
+			MethodSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_METHODS,
+			'Expected 1 blank line after method, found 3.'
+		);
 
 		self::assertAllFixedInFile($report);
 	}
@@ -60,7 +66,7 @@ public function testErrorsDifferentSettingsAndSameLinesCount(): void
 			'maxLinesCount' => 2,
 		]);
 
-		self::assertSame(4, $report->getErrorCount());
+		self::assertSame(5, $report->getErrorCount());
 
 		self::assertSniffError(
 			$report,
@@ -86,6 +92,12 @@ public function testErrorsDifferentSettingsAndSameLinesCount(): void
 			MethodSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_METHODS,
 			'Expected 2 blank lines after method, found 0.'
 		);
+		self::assertSniffError(
+			$report,
+			50,
+			MethodSpacingSniff::CODE_INCORRECT_LINES_COUNT_BETWEEN_METHODS,
+			'Expected 2 blank lines after method, found 3.'
+		);
 	}
 
 	public function testWithDifferentSettingsNoErrors(): void

tests/Sniffs/Classes/data/methodSpacingErrors.fixed.php

@@ -54,4 +54,10 @@ public function sixthMethod()
 
 	}
 
+	#[MyAttribute]
+	public function seventhMethod()
+	{
+
+	}
+
 }

tests/Sniffs/Classes/data/methodSpacingErrors.php

@@ -52,4 +52,12 @@ public function sixthMethod()
 
 	}
 
+
+
+	#[MyAttribute]
+	public function seventhMethod()
+	{
+
+	}
+
 }

tests/Sniffs/Classes/data/methodSpacingNoErrors.php

@@ -99,4 +99,9 @@ public function returnTrue(): bool
 		return [$anonymousClassA, $anonymousClassB];
 	}
 
+	#[MyAttribute]
+	public function sixthMethod()
+	{
+	}
+
 }