SlevomatCodingStandard.ControlStructures.DisallowTrailingMultiLineTernaryOperator: Report really only trailing ternary operator

Author: kukulich

SlevomatCodingStandard/Sniffs/ControlStructures/DisallowTrailingMultiLineTernaryOperatorSniff.php

@@ -8,15 +8,10 @@
 use SlevomatCodingStandard\Helpers\IndentationHelper;
 use SlevomatCodingStandard\Helpers\TernaryOperatorHelper;
 use SlevomatCodingStandard\Helpers\TokenHelper;
-use function array_merge;
-use function in_array;
 use function strlen;
 use function substr;
-use function trim;
 use const T_INLINE_ELSE;
 use const T_INLINE_THEN;
-use const T_OPEN_TAG;
-use const T_OPEN_TAG_WITH_ECHO;
 use const T_WHITESPACE;
 
 class DisallowTrailingMultiLineTernaryOperatorSniff implements Sniff
@@ -47,18 +42,7 @@ public function process(File $phpcsFile, $inlineThenPointer): void
 			return;
 		}
 
-		$inlineElsePointer = TernaryOperatorHelper::getElsePointer($phpcsFile, $inlineThenPointer);
-
-		if ($tokens[$inlineThenPointer]['line'] === $tokens[$inlineElsePointer]['line']) {
-			return;
-		}
-
-		$endOfLineBeforeInlineThenPointer = $this->getEndOfLineBefore($phpcsFile, $inlineThenPointer);
-		$endOfLineBeforeInlineElsePointer = $this->getEndOfLineBefore($phpcsFile, $inlineElsePointer);
-
-		$contentBeforeThen = TokenHelper::getContent($phpcsFile, $endOfLineBeforeInlineThenPointer + 1, $inlineThenPointer - 1);
-		$contentBeforeElse = TokenHelper::getContent($phpcsFile, $endOfLineBeforeInlineElsePointer + 1, $inlineElsePointer - 1);
-		if (trim($contentBeforeElse) === '' && trim($contentBeforeThen) === '') {
+		if ($tokens[$inlineThenPointer]['line'] === $tokens[$nextPointer]['line']) {
 			return;
 		}
 
@@ -72,6 +56,9 @@ public function process(File $phpcsFile, $inlineThenPointer): void
 			return;
 		}
 
+		$inlineElsePointer = TernaryOperatorHelper::getElsePointer($phpcsFile, $inlineThenPointer);
+		$endOfLineBeforeInlineThenPointer = TokenHelper::findLastTokenOnPreviousLine($phpcsFile, $inlineThenPointer);
+
 		$indentation = $this->getIndentation($phpcsFile, $endOfLineBeforeInlineThenPointer);
 		$pointerBeforeInlineThen = TokenHelper::findPreviousEffective($phpcsFile, $inlineThenPointer - 1);
 		$pointerAfterInlineThen = TokenHelper::findNextExcluding($phpcsFile, [T_WHITESPACE], $inlineThenPointer + 1);
@@ -95,43 +82,6 @@ public function process(File $phpcsFile, $inlineThenPointer): void
 		$phpcsFile->fixer->endChangeset();
 	}
 
-	private function getEndOfLineBefore(File $phpcsFile, int $pointer): int
-	{
-		$tokens = $phpcsFile->getTokens();
-
-		$endOfLineBefore = null;
-
-		$startPointer = $pointer - 1;
-		while (true) {
-			$possibleEndOfLinePointer = TokenHelper::findPrevious(
-				$phpcsFile,
-				array_merge([T_WHITESPACE, T_OPEN_TAG, T_OPEN_TAG_WITH_ECHO], TokenHelper::$inlineCommentTokenCodes),
-				$startPointer
-			);
-			if (
-				$tokens[$possibleEndOfLinePointer]['code'] === T_WHITESPACE
-				&& $tokens[$possibleEndOfLinePointer]['content'] === $phpcsFile->eolChar
-			) {
-				$endOfLineBefore = $possibleEndOfLinePointer;
-				break;
-			}
-
-			if (
-				in_array($tokens[$possibleEndOfLinePointer]['code'], TokenHelper::$inlineCommentTokenCodes, true)
-				&& substr($tokens[$possibleEndOfLinePointer]['content'], -1) === $phpcsFile->eolChar
-			) {
-				$endOfLineBefore = $possibleEndOfLinePointer;
-				break;
-			}
-
-			$startPointer = $possibleEndOfLinePointer - 1;
-		}
-
-		/** @var int $endOfLineBefore */
-		$endOfLineBefore = $endOfLineBefore;
-		return $endOfLineBefore;
-	}
-
 	private function getIndentation(File $phpcsFile, int $endOfLinePointer): string
 	{
 		$pointerAfterWhitespace = TokenHelper::findNextNonWhitespace($phpcsFile, $endOfLinePointer + 1);

tests/Sniffs/ControlStructures/DisallowTrailingMultiLineTernaryOperatorSniffTest.php

@@ -26,6 +26,7 @@ public function testErrors(): void
 		self::assertSniffError($report, 21, DisallowTrailingMultiLineTernaryOperatorSniff::CODE_TRAILING_MULTI_LINE_TERNARY_OPERATOR_USED);
 		self::assertSniffError($report, 25, DisallowTrailingMultiLineTernaryOperatorSniff::CODE_TRAILING_MULTI_LINE_TERNARY_OPERATOR_USED);
 		self::assertSniffError($report, 29, DisallowTrailingMultiLineTernaryOperatorSniff::CODE_TRAILING_MULTI_LINE_TERNARY_OPERATOR_USED);
+		self::assertSniffError($report, 33, DisallowTrailingMultiLineTernaryOperatorSniff::CODE_TRAILING_MULTI_LINE_TERNARY_OPERATOR_USED);
 
 		self::assertAllFixedInFile($report);
 	}

tests/Sniffs/ControlStructures/data/disallowTrailingMultiLineTernaryOperatorErrors.php

@@ -30,5 +30,6 @@ function () { return; };
 	'bbbb' :
 	(false ? 1 : 2);
 
-$array[$b === 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ? 'bbbb'
+$array[$b === 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ?
+	'bbbb'
 	: 'ccccccc'] = 'b';

tests/Sniffs/ControlStructures/data/disallowTrailingMultiLineTernaryOperatorNoErrors.php

@@ -56,3 +56,6 @@
 
 $a = $b === 'bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb' ? 'bbbb' :
 	'ccccccccccccc';
+
+$a = $b ? 'bbb'
+	: 'ccc';