SlevomatCodingStandard.Classes.MethodSpacing: Fixed check for methods with more attributes

Author: kukulich

SlevomatCodingStandard/Sniffs/Classes/MethodSpacingSniff.php

@@ -15,6 +15,7 @@
 use function sprintf;
 use function str_repeat;
 use const T_ATTRIBUTE;
+use const T_ATTRIBUTE_END;
 use const T_FUNCTION;
 use const T_SEMICOLON;
 
@@ -76,6 +77,23 @@ public function process(File $phpcsFile, $methodPointer): void
 				$nextMethodPointer - 1,
 				$methodEndPointer,
 			);
+
+			if ($nextMethodAttributeStartPointer !== null) {
+				do {
+					$pointerBefore = TokenHelper::findPreviousNonWhitespace(
+						$phpcsFile,
+						$nextMethodAttributeStartPointer - 1,
+						$methodEndPointer,
+					);
+
+					if ($tokens[$pointerBefore]['code'] === T_ATTRIBUTE_END) {
+						$nextMethodAttributeStartPointer = $tokens[$pointerBefore]['attribute_opener'];
+						continue;
+					}
+
+					break;
+				} while (true);
+			}
 		}
 
 		$nextMethodFirstLinePointer = $tokens[$nextMethodPointer]['line'] === $tokens[$methodEndPointer]['line']

tests/Sniffs/Classes/MethodSpacingSniffTest.php

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

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

@@ -60,4 +60,10 @@ public function seventhMethod()
 
 	}
 
+	#[MyAttribute]
+	#[MyAttribute2]
+	public function eighthMethod()
+	{
+	}
+
 }

tests/Sniffs/Classes/data/methodSpacingErrors.php

@@ -60,4 +60,13 @@ public function seventhMethod()
 
 	}
 
+
+
+
+	#[MyAttribute]
+	#[MyAttribute2]
+	public function eighthMethod()
+	{
+	}
+
 }