ControlStructureSpacingSniff: Fixed false positive

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

@@ -19,10 +19,12 @@
 use function strlen;
 use function substr;
 use function substr_count;
+use const T_ANON_CLASS;
 use const T_BREAK;
 use const T_CASE;
 use const T_CATCH;
 use const T_CLOSE_CURLY_BRACKET;
+use const T_CLOSURE;
 use const T_COLON;
 use const T_COMMENT;
 use const T_CONTINUE;
@@ -361,7 +363,12 @@ private function findControlStructureEnd(File $phpcsFile, int $controlStructureP
 			return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $pointerAfterControlStructureEnd - 1);
 		}
 
-		return (int) TokenHelper::findNext($phpcsFile, T_SEMICOLON, $controlStructurePointer + 1);
+		$nextPointer = TokenHelper::findNext($phpcsFile, [T_SEMICOLON, T_ANON_CLASS, T_CLOSURE], $controlStructurePointer + 1);
+		if ($tokens[$nextPointer]['code'] === T_SEMICOLON) {
+			return $nextPointer;
+		}
+
+		return (int) TokenHelper::findNext($phpcsFile, T_SEMICOLON, $tokens[$nextPointer]['scope_closer'] + 1);
 	}
 
 	private function isWhilePartOfDo(File $phpcsFile, int $controlStructurePointer): bool

tests/Sniffs/ControlStructures/ControlStructureSpacingSniffTest.php

@@ -19,7 +19,7 @@ public function testDefaultSettingsErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/controlStructureSpacingWithDefaultSettingsErrors.php');
 
-		self::assertSame(47, $report->getErrorCount());
+		self::assertSame(49, $report->getErrorCount());
 
 		self::assertSniffError($report, 4, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "if", found 2.');
 		self::assertSniffError($report, 4, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "if", found 0.');
@@ -67,6 +67,8 @@ public function testDefaultSettingsErrors(): void
 		self::assertSniffError($report, 148, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "if", found 0.');
 		self::assertSniffError($report, 155, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "if", found 2.');
 		self::assertSniffError($report, 168, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_FIRST_CONTROL_STRUCTURE, 'Expected 0 lines before "return", found 1.');
+		self::assertSniffError($report, 173, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_FIRST_CONTROL_STRUCTURE, 'Expected 0 lines before "return", found 1.');
+		self::assertSniffError($report, 182, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_LAST_CONTROL_STRUCTURE, 'Expected 0 lines after "return", found 1.');
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/ControlStructures/data/controlStructureSpacingWithDefaultSettingsErrors.fixed.php

@@ -151,3 +151,27 @@ function () {
 	// Multiline
 	return true;
 };
+
+function () {
+	return function () {
+		$a = 1;
+		$b = 2;
+
+		return $a * $b;
+	};
+};
+
+function () {
+	return new class implements Countable
+	{
+
+		public function count()
+		{
+			$a = 1;
+			$b = 2;
+
+			return $a * $b;
+		}
+
+	};
+};

tests/Sniffs/ControlStructures/data/controlStructureSpacingWithDefaultSettingsErrors.php

@@ -167,3 +167,29 @@ function () {
 	// Multiline
 	return true;
 };
+
+function () {
+
+	return function () {
+		$a = 1;
+		$b = 2;
+
+		return $a * $b;
+	};
+};
+
+function () {
+	return new class implements Countable
+	{
+
+		public function count()
+		{
+			$a = 1;
+			$b = 2;
+
+			return $a * $b;
+		}
+
+	};
+
+};

tests/Sniffs/ControlStructures/data/controlStructureSpacingWithDefaultSettingsNoErrors.php

@@ -111,6 +111,30 @@ function () {
 	return true;
 };
 
+function () {
+	return function () {
+		$a = 1;
+		$b = 2;
+
+		return $a * $b;
+	};
+};
+
+function () {
+	return new class implements Countable
+	{
+
+		public function count()
+		{
+			$a = 1;
+			$b = 2;
+
+			return $a * $b;
+		}
+
+	};
+};
+
 if (true) {
 
 }