SlevomatCodingStandard.ControlStructures.EarlyExit: Fixed detection of useless else

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php

@@ -176,14 +176,6 @@ private function processElse(File $phpcsFile, int $elsePointer): void
 			return;
 		}
 
-		$pointerAfterElseCondition = TokenHelper::findNextEffective($phpcsFile, $tokens[$elsePointer]['scope_closer'] + 1);
-		if (
-			$pointerAfterElseCondition !== null
-			&& $tokens[$pointerAfterElseCondition]['code'] !== T_CLOSE_CURLY_BRACKET
-		) {
-			return;
-		}
-
 		$fix = $phpcsFile->addFixableError('Remove useless "else" to reduce code nesting.', $elsePointer, self::CODE_USELESS_ELSE);
 
 		if (!$fix) {

tests/Sniffs/ControlStructures/EarlyExitSniffTest.php

@@ -17,7 +17,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/earlyExitErrors.php');
 
-		self::assertSame(73, $report->getErrorCount());
+		self::assertSame(74, $report->getErrorCount());
 
 		foreach ([6, 15, 24, 33, 42, 50, 58, 66, 74, 82, 90, 98, 108, 149, 157, 165, 191, 199, 207] as $line) {
 			self::assertSniffError($report, $line, EarlyExitSniff::CODE_EARLY_EXIT_NOT_USED, 'Use early exit instead of "else".');
@@ -27,7 +27,7 @@ public function testErrors(): void
 			self::assertSniffError($report, $line, EarlyExitSniff::CODE_EARLY_EXIT_NOT_USED, 'Use early exit to reduce code nesting.');
 		}
 
-		foreach ([173, 182, 328, 353, 390, 432, 454, 467, 572] as $line) {
+		foreach ([173, 182, 328, 353, 390, 432, 454, 467, 573, 583] as $line) {
 			self::assertSniffError($report, $line, EarlyExitSniff::CODE_USELESS_ELSE, 'Remove useless "else" to reduce code nesting.');
 		}
 

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

@@ -658,6 +658,17 @@ function booleanOperatorPriorities(bool $a, bool $b, bool $c): void
 	echo 'OK';
 }
 
+// With some text after if
+function () {
+	if (true) {
+		throw new \Exception('');
+	}
+
+	echo 'world';
+
+	echo 'hello';
+};
+
 // Simple else - needs to be last
 if (true) {
 	return true;

tests/Sniffs/ControlStructures/data/earlyExitErrors.php

@@ -566,6 +566,17 @@ function booleanOperatorPriorities(bool $a, bool $b, bool $c): void
 	}
 }
 
+// With some text after if
+function () {
+	if (true) {
+		throw new \Exception('');
+	} else {
+		echo 'world';
+	}
+
+	echo 'hello';
+};
+
 // Simple else - needs to be last
 if (true) {
 	return true;

tests/Sniffs/ControlStructures/data/earlyExitNoErrors.php

@@ -162,28 +162,6 @@ function oneConditionsWithoutEarlyExit($dateTime) {
 	throw new NotImplementedException();
 }
 
-function allConditionsWithEarlyExitButCodeAfter($dateTime) {
-	if ($dateTime instanceof DateTimeImmutable) {
-		return true;
-	}
-
-	if ($dateTime instanceof DateTime) {
-		return true;
-	}
-
-	if (is_numeric($dateTime)) {
-		return true;
-	}
-
-	if (is_string($dateTime)) {
-		throw new NotImplementedException();
-	} else {
-		throw new NotImplementedException();
-	}
-
-	doSomething();
-}
-
 // Code in the end of file
 if (!empty($_SERVER['argv'])) {
 	something();