Fix bug in UnneededElse.

Author: dereuromark

PSR2R/Sniffs/ControlStructures/UnneededElseSniff.php

@@ -26,10 +26,6 @@ public function register(): array {
 	public function process(File $phpcsFile, $stackPtr) {
 		$tokens = $phpcsFile->getTokens();
 
-		if ($tokens[$stackPtr]['code'] === T_ELSEIF && $this->isNotLastCondition($phpcsFile, $stackPtr)) {
-			return;
-		}
-
 		$prevScopeEndIndex = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
 		if (!$prevScopeEndIndex || empty($tokens[$prevScopeEndIndex]['scope_opener'])) {
 			return;
@@ -129,31 +125,6 @@ public function process(File $phpcsFile, $stackPtr) {
 		$phpcsFile->fixer->endChangeset();
 	}
 
-	/**
-	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
-	 * @param int $stackPtr
-	 *
-	 * @return bool
-	 */
-	protected function isNotLastCondition(File $phpcsFile, int $stackPtr): bool {
-		$tokens = $phpcsFile->getTokens();
-
-		// Abort if not known
-		if (empty($tokens[$stackPtr]['scope_closer'])) {
-			return true;
-		}
-
-		$nextScopeEndIndex = $tokens[$stackPtr]['scope_closer'];
-
-		$nextConditionStartIndex = $phpcsFile->findNext(T_WHITESPACE, $nextScopeEndIndex + 1, null, true);
-
-		if (in_array($tokens[$nextConditionStartIndex]['code'], [T_ELSEIF, T_ELSE], true)) {
-			return true;
-		}
-
-		return false;
-	}
-
 	/**
 	 * @param \PHP_CodeSniffer\Files\File $phpcsFile
 	 * @param int $stackPtr
@@ -166,10 +137,7 @@ protected function fixElseIfToIf(File $phpcsFile, int $stackPtr): void {
 		$phpcsFile->fixer->beginChangeset();
 
 		$prevIndex = $phpcsFile->findPrevious(T_WHITESPACE, $stackPtr - 1, null, true);
-		$indentationLevel = $tokens[$prevIndex]['column'] - 1;
-		$indentationCharacter = $this->getIndentationCharacter($this->getIndentationWhitespace($phpcsFile, $prevIndex));
-
-		$indentation = str_repeat($indentationCharacter, $indentationLevel);
+		$indentation = $this->getIndentationWhitespace($phpcsFile, $prevIndex);
 
 		for ($i = $prevIndex + 1; $i < $stackPtr; $i++) {
 			$phpcsFile->fixer->replaceToken($i, '');