EarlyExitSniff: New option "ignoreOneLineTrailingIf"

README.md

@@ -176,6 +176,18 @@ foreach ($values as $value) {
 }
 ```
 
+* `ignoreOneLineTrailingIf`: ignores `if` that has one line content and is on the last position in scope, like this:
+
+```php
+foreach ($values as $value) {
+    $value .= 'whatever';
+
+	if ($value) {
+		doSomething();
+	}
+}
+```
+
 #### SlevomatCodingStandard.Functions.StaticClosure 🔧
 
 Reports closures not using `$this` that are not declared `static`.

SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php

@@ -40,6 +40,9 @@ class EarlyExitSniff implements Sniff
 	/** @var bool */
 	public $ignoreStandaloneIfInScope = false;
 
+	/** @var bool */
+	public $ignoreOneLineTrailingIf = false;
+
 	/**
 	 * @return array<int, (int|string)>
 	 */
@@ -283,6 +286,13 @@ private function processIf(File $phpcsFile, int $ifPointer): void
 			return;
 		}
 
+		if (
+			$this->ignoreOneLineTrailingIf
+			&& $tokens[$tokens[$ifPointer]['scope_opener']]['line'] + 2 === $tokens[$tokens[$ifPointer]['scope_closer']]['line']
+		) {
+			return;
+		}
+
 		$scopePointer = $tokens[$nextPointer]['scope_condition'];
 
 		if (!in_array($tokens[$scopePointer]['code'], [T_FUNCTION, T_CLOSURE, T_WHILE, T_DO, T_FOREACH, T_FOR], true)) {

tests/Sniffs/ControlStructures/EarlyExitSniffTest.php

@@ -101,4 +101,27 @@ public function testNotIgnoredStandaloneIfInScopeErrors(): void
 		self::assertSniffError($report, 11, EarlyExitSniff::CODE_EARLY_EXIT_NOT_USED, 'Use early exit to reduce code nesting.');
 	}
 
+	public function testIgnoredOneLineTrailingIfNoErrors(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/earlyExitIgnoredOneLineTrailingIfNoErrors.php', [
+			'ignoreOneLineTrailingIf' => true,
+		]);
+
+		self::assertNoSniffErrorInFile($report);
+	}
+
+	public function testIgnoredOneLineTrailingIfErrors(): void
+	{
+		$report = self::checkFile(__DIR__ . '/data/earlyExitIgnoredOneLineTrailingIfErrors.php', [
+			'ignoreOneLineTrailingIf' => true,
+		]);
+
+		self::assertSame(2, $report->getErrorCount());
+
+		self::assertSniffError($report, 7, EarlyExitSniff::CODE_USELESS_ELSEIF);
+		self::assertSniffError($report, 17, EarlyExitSniff::CODE_USELESS_ELSEIF);
+
+		self::assertAllFixedInFile($report);
+	}
+
 }

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

@@ -0,0 +1,28 @@
+<?php
+
+function ($values) {
+	foreach ($values as $value) {
+		if ($value === null) {
+			return;
+		}
+
+		if ($value) {
+			doSomething();
+		}
+	}
+};
+
+function ($values) {
+	foreach ($values as $value) {
+		if ($value === null) {
+			return;
+		}
+
+		if (!$value) {
+			continue;
+		}
+
+		doSomething();
+		doMore();
+	}
+};

tests/Sniffs/ControlStructures/data/earlyExitIgnoredOneLineTrailingIfErrors.php

@@ -0,0 +1,22 @@
+<?php
+
+function ($values) {
+	foreach ($values as $value) {
+		if ($value === null) {
+			return;
+		} elseif ($value) {
+			doSomething();
+		}
+	}
+};
+
+function ($values) {
+	foreach ($values as $value) {
+		if ($value === null) {
+			return;
+		} elseif ($value) {
+			doSomething();
+			doMore();
+		}
+	}
+};

tests/Sniffs/ControlStructures/data/earlyExitIgnoredOneLineTrailingIfNoErrors.php

@@ -0,0 +1,19 @@
+<?php
+
+function ($values) {
+	foreach ($values as $value) {
+		if ($value) {
+			doSomething();
+		}
+	}
+};
+
+function ($values) {
+	foreach ($values as $value) {
+		$value .= 'whatever';
+
+		if ($value) {
+			doSomething();
+		}
+	}
+};