EarlyExitSniff: Fixed false positive

slevomat · May 13, 2020 · 2999540 · 2999540
1 parent 31eac88
commit 2999540
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php b/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php
@@ -11,6 +11,7 @@
 use SlevomatCodingStandard\Helpers\TokenHelper;
 use Throwable;
 use function array_key_exists;
+use function count;
 use function in_array;
 use function range;
 use function sort;
@@ -106,17 +107,17 @@ private function processElse(File $phpcsFile, int $elsePointer): void
 				continue;
 			}
 
+			if (count($allConditionsPointers) > 2 && $conditionEarlyExitPointer === null) {
+				return;
+			}
+
 			$previousConditionPointer = $conditionPointer;
 			$previousConditionEarlyExitPointer = $conditionEarlyExitPointer;
 
 			if ($conditionPointer === $ifPointer) {
 				$ifEarlyExitPointer = $conditionEarlyExitPointer;
 				continue;
 			}
-
-			if ($conditionEarlyExitPointer === null) {
-				return;
-			}
 		}
 
 		if ($ifEarlyExitPointer === null && $elseEarlyExitPointer === null) {

diff --git a/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php b/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php
@@ -207,3 +207,14 @@ function nestedIfWhenOneBranchDoesNotHaveEarlyExit($a, $b)
 		doElse();
 	}
 };
+
+function oneConditionWithoutEarlyExitWithElse()
+{
+	if (true) {
+		doAnything();
+	} elseif (false) {
+		return;
+	} else {
+		throw new \Exception('');
+	}
+};