UselessParenthesesSniff: Fixed checks for parentheses around "case"

Author: kukulich

SlevomatCodingStandard/Sniffs/PHP/UselessParenthesesSniff.php

@@ -8,8 +8,10 @@
 use SlevomatCodingStandard\Helpers\TokenHelper;
 use const T_ANON_CLASS;
 use const T_BOOLEAN_NOT;
+use const T_CASE;
 use const T_CLOSE_PARENTHESIS;
 use const T_CLOSURE;
+use const T_COLON;
 use const T_DOLLAR;
 use const T_EMPTY;
 use const T_EVAL;
@@ -68,20 +70,21 @@ public function process(File $phpcsFile, $parenthesisOpenerPointer): void
 		}
 
 		$this->checkParenthesesAroundConditionInTernaryOperator($phpcsFile, $parenthesisOpenerPointer);
+		$this->checkParenthesesAroundCaseInSwitch($phpcsFile, $parenthesisOpenerPointer);
 		$this->checkParenthesesAroundVariableOrFunctionCall($phpcsFile, $parenthesisOpenerPointer);
 	}
 
 	private function checkParenthesesAroundConditionInTernaryOperator(File $phpcsFile, int $parenthesisOpenerPointer): void
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$pointerBeforeParenthesisOpener = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
-		if ($tokens[$pointerBeforeParenthesisOpener]['code'] === T_BOOLEAN_NOT) {
+		$ternaryOperatorPointer = TokenHelper::findNextEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1);
+		if ($tokens[$ternaryOperatorPointer]['code'] !== T_INLINE_THEN) {
 			return;
 		}
 
-		$ternaryOperatorPointer = TokenHelper::findNextEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1);
-		if ($tokens[$ternaryOperatorPointer]['code'] !== T_INLINE_THEN) {
+		$pointerBeforeParenthesisOpener = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
+		if ($tokens[$pointerBeforeParenthesisOpener]['code'] === T_BOOLEAN_NOT) {
 			return;
 		}
 
@@ -110,12 +113,49 @@ private function checkParenthesesAroundConditionInTernaryOperator(File $phpcsFil
 		$phpcsFile->fixer->endChangeset();
 	}
 
+	private function checkParenthesesAroundCaseInSwitch(File $phpcsFile, int $parenthesisOpenerPointer): void
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$pointerBeforeParenthesisOpener = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
+		if ($tokens[$pointerBeforeParenthesisOpener]['code'] !== T_CASE) {
+			return;
+		}
+
+		$pointerAfterParenthesisCloser = TokenHelper::findNextEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1);
+		if ($tokens[$pointerAfterParenthesisCloser]['code'] !== T_COLON) {
+			return;
+		}
+
+		$fix = $phpcsFile->addFixableError('Useless parentheses.', $parenthesisOpenerPointer, self::CODE_USELESS_PARENTHESES);
+
+		if (!$fix) {
+			return;
+		}
+
+		$contentStartPointer = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
+		$contentEndPointer = TokenHelper::findPreviousEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] - 1);
+
+		$phpcsFile->fixer->beginChangeset();
+		for ($i = $parenthesisOpenerPointer; $i < $contentStartPointer; $i++) {
+			$phpcsFile->fixer->replaceToken($i, '');
+		}
+		for ($i = $contentEndPointer + 1; $i <= $tokens[$parenthesisOpenerPointer]['parenthesis_closer']; $i++) {
+			$phpcsFile->fixer->replaceToken($i, '');
+		}
+		$phpcsFile->fixer->endChangeset();
+	}
+
 	private function checkParenthesesAroundVariableOrFunctionCall(File $phpcsFile, int $parenthesisOpenerPointer): void
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$ternaryOperatorPointer = TokenHelper::findNextEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1);
+		$casePointer = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
+		if ($tokens[$casePointer]['code'] === T_CASE) {
+			return;
+		}
 
+		$ternaryOperatorPointer = TokenHelper::findNextEffective($phpcsFile, $tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1);
 		if ($tokens[$ternaryOperatorPointer]['code'] === T_INLINE_THEN) {
 			return;
 		}

tests/Sniffs/PHP/UselessParenthesesSniffTest.php

@@ -17,9 +17,9 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/uselessParenthesesErrors.php');
 
-		self::assertSame(27, $report->getErrorCount());
+		self::assertSame(31, $report->getErrorCount());
 
-		foreach ([8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 36, 37, 38] as $line) {
+		foreach ([8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 36, 37, 38, 41, 42, 43, 44] as $line) {
 			self::assertSniffError($report, $line, UselessParenthesesSniff::CODE_USELESS_PARENTHESES);
 		}
 

tests/Sniffs/PHP/data/uselessParenthesesErrors.fixed.php

@@ -36,3 +36,10 @@ public function __construct($parameter)
 $x = $y !== null ? true : false;
 $a = $b ? 1 : 0;
 $c = $d ? 1 : 0;
+
+switch (true) {
+	case $boo:
+	case $boo === true:
+	case $boo ? true : false:
+	case $boo ? true : false:
+}

tests/Sniffs/PHP/data/uselessParenthesesErrors.php

@@ -36,3 +36,10 @@ public function __construct($parameter)
 $x = ($y !== null) ? true : false;
 $a = ($b) ? 1 : 0;
 $c = (   $d    ) ? 1 : 0;
+
+switch (true) {
+	case ($boo):
+	case ($boo === true):
+	case ($boo ? true : false):
+	case ($boo) ? true : false:
+}

tests/Sniffs/PHP/data/uselessParenthesesNoErrors.php

@@ -59,3 +59,7 @@ function doSomething($parameter) {
 eval($c);
 
 list($c) = [];
+
+switch (true) {
+	case !($boo !== null):
+}