SlevomatCodingStandard.PHP.UselessParentheses: Fix of fix

Author: kukulich

SlevomatCodingStandard/Sniffs/PHP/UselessParenthesesSniff.php

@@ -234,10 +234,6 @@ private function checkParenthesesAroundConditionInTernaryOperator(File $phpcsFil
 			return;
 		}
 
-		if (in_array($tokens[$pointerBeforeParenthesisOpener]['code'], self::OPERATORS, true)) {
-			return;
-		}
-
 		if (in_array($tokens[$pointerBeforeParenthesisOpener]['code'], Tokens::$comparisonTokens, true)) {
 			return;
 		}
@@ -328,12 +324,16 @@ private function checkParenthesesAroundVariableOrFunctionCall(File $phpcsFile, i
 	{
 		$tokens = $phpcsFile->getTokens();
 
-		$newPointer = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
-		if ($tokens[$newPointer]['code'] === T_NEW) {
+		$pointerAfterParenthesis = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
+		if ($tokens[$pointerAfterParenthesis]['code'] === T_NEW) {
 			// Check in other method
 			return;
 		}
 
+		if ($tokens[$pointerAfterParenthesis]['code'] === T_OPEN_PARENTHESIS) {
+			return;
+		}
+
 		$operatorsPointers = TokenHelper::findNextAll(
 			$phpcsFile,
 			self::OPERATORS,

tests/Sniffs/PHP/UselessParenthesesSniffTest.php

@@ -17,9 +17,9 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/uselessParenthesesErrors.php');
 
-		self::assertSame(44, $report->getErrorCount());
+		self::assertSame(46, $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, 41, 42, 43, 44, 49, 53, 55, 56, 57, 58, 62, 64, 67, 72] 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, 49, 53, 55, 56, 57, 58, 62, 63, 65, 67, 70, 75] as $line) {
 			self::assertSniffError($report, $line, UselessParenthesesSniff::CODE_USELESS_PARENTHESES);
 		}
 

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

@@ -59,6 +59,9 @@ function () {
 $x = $b + 100 - $c;
 $x = $b * 100 / $c;
 
+echo 'Hello' . $foo ? ' There' : $fn();
+echo 'Hello' . ($foo ? ' There' : $fn());
+
 $remoteAddress = new RemoteAddress();
 $remotedAddresses = [
 	new RemoteAddress()

tests/Sniffs/PHP/data/uselessParenthesesErrors.php

@@ -59,6 +59,9 @@ function () {
 $x = $b + (100 - $c);
 $x = $b * (100 / $c);
 
+echo 'Hello' . ($foo) ? ' There' : $fn();
+echo 'Hello' . (($foo) ? ' There' : $fn());
+
 $remoteAddress = (new RemoteAddress());
 $remotedAddresses = [
 	(new RemoteAddress())

tests/Sniffs/PHP/data/uselessParenthesesNoErrors.php

@@ -175,7 +175,7 @@ function ($value) {
 
 $anotherObject = new ($object->getClassName());
 
-echo 'Hello' . ($foo) ? ' There' : $fn();
+echo 'Hello' . ($foo ? ' There' : $fn());
 
 $response = (new Response())->withStatus(200);
 $ip = (new RemoteAddress())?->getIpAddress();