EarlyExitSniff: Fixed internal error

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/EarlyExitSniff.php

@@ -165,6 +165,7 @@ private function processElse(File $phpcsFile, int $elsePointer): void
 		if (
 			$previousConditionEarlyExitPointer !== null
 			&& $tokens[$previousConditionEarlyExitPointer]['code'] === T_YIELD
+			&& $elseEarlyExitPointer !== null
 			&& $tokens[$elseEarlyExitPointer]['code'] === T_YIELD
 		) {
 			return;

tests/Sniffs/ControlStructures/EarlyExitSniffTest.php

@@ -17,7 +17,7 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/earlyExitErrors.php');
 
-		self::assertSame(64, $report->getErrorCount());
+		self::assertSame(65, $report->getErrorCount());
 
 		foreach ([6, 15, 24, 33, 42, 50, 58, 66, 74, 82, 90, 98, 108, 149, 157, 165, 191, 199, 207, 376] 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, 398, 440, 462, 475, 503] as $line) {
+		foreach ([173, 182, 328, 353, 398, 440, 462, 475, 505, 514] as $line) {
 			self::assertSniffError($report, $line, EarlyExitSniff::CODE_USELESS_ELSE, 'Remove useless "else" to reduce code nesting.');
 		}
 

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

@@ -569,6 +569,17 @@ function nestedIfWhenOneBranchDoesNotHaveEarlyExit($a, $b)
 	}
 };
 
+function yieldWithElse($handle)
+{
+	while (($data = fgetcsv($handle, 0, ',')) !== false) {
+		if (is_numeric($data[0])) {
+			yield $data;
+		}
+
+		echo 'skip';
+	}
+};
+
 // Simple else - needs to be last
 if (true) {
 	return true;

tests/Sniffs/ControlStructures/data/earlyExitErrors.php

@@ -497,6 +497,17 @@ function nestedIfWhenOneBranchDoesNotHaveEarlyExit($a, $b)
 	}
 };
 
+function yieldWithElse($handle)
+{
+	while (($data = fgetcsv($handle, 0, ',')) !== false) {
+		if (is_numeric($data[0])) {
+			yield $data;
+		} else {
+			echo 'skip';
+		}
+	}
+};
+
 // Simple else - needs to be last
 if (true) {
 	return true;