BlockControlStructureSpacingSniff: Fixed false positive

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/AbstractControlStructureSpacing.php

@@ -377,18 +377,21 @@ private function findControlStructureEnd(File $phpcsFile, int $controlStructureP
 
 		if (in_array($tokens[$controlStructurePointer]['code'], [T_CASE, T_DEFAULT], true)) {
 			$switchPointer = TokenHelper::findPrevious($phpcsFile, T_SWITCH, $controlStructurePointer - 1);
-			$pointerAfterControlStructureEnd = TokenHelper::findNext(
+
+			$pointers = TokenHelper::findNextAll(
 				$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);
+			foreach ($pointers as $pointer) {
+				if (TokenHelper::findPrevious($phpcsFile, T_SWITCH, $pointer - 1) === $switchPointer) {
+					return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $pointer - 1);
+				}
 			}
 
-			return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $pointerAfterControlStructureEnd - 1);
+			return TokenHelper::findPreviousExcluding($phpcsFile, T_WHITESPACE, $tokens[$switchPointer]['scope_closer'] - 1);
 		}
 
 		$nextPointer = TokenHelper::findNext(

tests/Sniffs/ControlStructures/data/blockControlStructureSpacingWithDefaultSettingsNoErrors.php

@@ -90,6 +90,16 @@ function ($foo) {
 	}
 };
 
+function () {
+	switch (true) {
+		default:
+			switch (true) {
+				default:
+					break;
+			}
+	}
+};
+
 switch ($foo) {
     case 'bar':