EarlyExitSniff: Fixed false positives

slevomat · Nov 26, 2020 · 23de77f · 23de77f
1 parent 79386c1
commit 23de77f
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php b/SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php
@@ -93,6 +93,15 @@ private function processElse(File $phpcsFile, int $elsePointer): void
 			return;
 		}
 
+		if (TokenHelper::findNext(
+			$phpcsFile,
+			T_FUNCTION,
+			$tokens[$elsePointer]['scope_opener'] + 1,
+			$tokens[$elsePointer]['scope_closer']
+		) !== null) {
+			return;
+		}
+
 		$ifPointer = $allConditionsPointers[0];
 		$ifEarlyExitPointer = null;
 		$elseEarlyExitPointer = null;
@@ -220,6 +229,15 @@ private function processElseIf(File $phpcsFile, int $elseIfPointer): void
 			return;
 		}
 
+		if (TokenHelper::findNext(
+			$phpcsFile,
+			T_FUNCTION,
+			$tokens[$elseIfPointer]['scope_opener'] + 1,
+			$tokens[$elseIfPointer]['scope_closer']
+		) !== null) {
+			return;
+		}
+
 		foreach ($allConditionsPointers as $conditionPointer) {
 			$conditionEarlyExitPointer = $this->findEarlyExitInScope(
 				$phpcsFile,

diff --git a/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php b/tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php
@@ -218,3 +218,37 @@ function oneConditionWithoutEarlyExitWithElse()
 		throw new \Exception('');
 	}
 };
+
+function functionInElse()
+{
+	if (rand(0, 1)) {
+		function test()
+		{
+			echo 1;
+		}
+
+		return;
+	} else {
+		function test()
+		{
+			echo 0;
+		}
+	}
+};
+
+function functionInElseIf()
+{
+	if (rand(0, 1)) {
+		function test()
+		{
+			echo 1;
+		}
+
+		return;
+	} elseif (false) {
+		function test()
+		{
+			echo 0;
+		}
+	}
+};