ControlStructureSpacingSniff: Added T_CASE and T_DEFAULT support

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/ControlStructureSpacingSniff.php

@@ -228,7 +228,9 @@ private function checkLinesAfter(File $phpcsFile, int $controlStructurePointer):
 		$hasCommentAfter = in_array($tokens[$notWhitespacePointerAfter]['code'], Tokens::$commentTokens, true) && $tokens[$notWhitespacePointerAfter]['line'] === $tokens[$controlStructureEndPointer]['line'];
 		$pointerAfter = $hasCommentAfter ? TokenHelper::findNextEffective($phpcsFile, $controlStructureEndPointer + 1) : $notWhitespacePointerAfter;
 
-		$isLastControlStructure = in_array($tokens[$pointerAfter]['code'], [T_CLOSE_CURLY_BRACKET, T_CASE, T_DEFAULT], true);
+		$isLastControlStructure = in_array($tokens[$controlStructurePointer]['code'], [T_CASE, T_DEFAULT], true)
+			? $tokens[$pointerAfter]['code'] === T_CLOSE_CURLY_BRACKET
+			: in_array($tokens[$pointerAfter]['code'], [T_CLOSE_CURLY_BRACKET, T_CASE, T_DEFAULT], true);
 
 		$requiredLinesCountAfter = SniffSettingsHelper::normalizeInteger($isLastControlStructure ? $this->linesCountAfterLastControlStructure : $this->linesCountAroundControlStructure);
 		$actualLinesCountAfter = $tokens[$pointerAfter]['line'] - $tokens[$controlStructureEndPointer]['line'] - 1;
@@ -348,6 +350,17 @@ private function findControlStructureEnd(File $phpcsFile, int $controlStructureP
 			return $tokens[$controlStructurePointer]['scope_closer'];
 		}
 
+		if (in_array($tokens[$controlStructurePointer]['code'], [T_CASE, T_DEFAULT], true)) {
+			$switchPointer = TokenHelper::findPrevious($phpcsFile, T_SWITCH, $controlStructurePointer - 1);
+			$pointerAfterControlStructureEnd = TokenHelper::findNext($phpcsFile, [T_CASE, T_DEFAULT], $controlStructurePointer + 1, $tokens[$switchPointer]['scope_closer']);
+
+			if ($pointerAfterControlStructureEnd === null) {
+				return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $tokens[$switchPointer]['scope_closer'] - 1);
+			}
+
+			return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $pointerAfterControlStructureEnd - 1);
+		}
+
 		return (int) TokenHelper::findNext($phpcsFile, T_SEMICOLON, $controlStructurePointer + 1);
 	}
 

tests/Sniffs/ControlStructures/ControlStructureSpacingSniffTest.php

@@ -118,7 +118,6 @@ public function testModifiedSettingsErrors(): void
 				'T_YIELD_FROM',
 			],
 		]);
-
 		self::assertSame(23, $report->getErrorCount());
 
 		self::assertSniffError($report, 21, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 0 lines before "while", found 2.');
@@ -148,6 +147,26 @@ public function testModifiedSettingsErrors(): void
 		self::assertAllFixedInFile($report);
 	}
 
+	public function testSwitchErrors(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/controlStructureSpacingSwitchErrors.php', [
+			'tokensToCheck' => [
+				'T_CASE',
+				'T_DEFAULT',
+			],
+		]);
+		self::assertSame(6, $report->getErrorCount());
+
+		self::assertSniffError($report, 6, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_FIRST_CONTROL_STRUCTURE, 'Expected 0 lines before "case", found 1.');
+		self::assertSniffError($report, 6, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "case", found 2.');
+		self::assertSniffError($report, 11, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "case", found 2.');
+		self::assertSniffError($report, 11, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_CONTROL_STRUCTURE, 'Expected 1 lines after "case", found 0.');
+		self::assertSniffError($report, 14, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_BEFORE_CONTROL_STRUCTURE, 'Expected 1 lines before "default", found 0.');
+		self::assertSniffError($report, 14, ControlStructureSpacingSniff::CODE_INCORRECT_LINES_COUNT_AFTER_LAST_CONTROL_STRUCTURE, 'Expected 0 lines after "default", found 1.');
+
+		self::assertAllFixedInFile($report);
+	}
+
 	public function testThrowExceptionForUndefinedConstant(): void
 	{
 		try {

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

@@ -0,0 +1,16 @@
+<?php
+
+switch ($condition)
+{
+	case 'a':
+
+		return new A();
+
+	case 'b':
+
+		return new B();
+
+	default:
+
+		throw new InvalidArgumentException('...');
+}

tests/Sniffs/ControlStructures/data/controlStructureSpacingSwitchErrors.php

@@ -0,0 +1,18 @@
+<?php
+
+switch ($condition)
+{
+
+	case 'a':
+
+		return new A();
+
+
+	case 'b':
+
+		return new B();
+	default:
+
+		throw new InvalidArgumentException('...');
+
+}