Fix bug in UnneededElse.

dereuromark · dereuromark · commit 5b799a2e24f1 · 2025-10-20T18:45:53.000+02:00
diff --git a/PSR2R/Sniffs/ControlStructures/UnneededElseSniff.php b/PSR2R/Sniffs/ControlStructures/UnneededElseSniff.php
@@ -41,8 +41,7 @@ public function process(File $phpcsFile, $stackPtr) {
 		$parenthesisStartIndex = $tokens[$prevParenthesisEndIndex]['parenthesis_opener'];
 
 		$prevConditionIndex = $phpcsFile->findPrevious(T_WHITESPACE, $parenthesisStartIndex - 1, null, true);
-		// We only do trivial fixes right now
-		if ($tokens[$prevConditionIndex]['code'] !== T_IF) {
+		if (!in_array($tokens[$prevConditionIndex]['code'], [T_IF, T_ELSEIF], true)) {
 			return;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,7 @@ public function process(File $phpcsFile, $stackPtr) {`
`41`	`41`	`$parenthesisStartIndex = $tokens[$prevParenthesisEndIndex]['parenthesis_opener'];`
`42`	`42`
`43`	`43`	`$prevConditionIndex = $phpcsFile->findPrevious(T_WHITESPACE, $parenthesisStartIndex - 1, null, true);`
`44`		`- // We only do trivial fixes right now`
`45`		`- if ($tokens[$prevConditionIndex]['code'] !== T_IF) {`
	`44`	`+ if (!in_array($tokens[$prevConditionIndex]['code'], [T_IF, T_ELSEIF], true)) {`
`46`	`45`	`return;`
`47`	`46`	`}`
`48`	`47`