SlevomatCodingStandard.PHP.UselessParentheses: Checks useless parenth…

…eses around (new class)
slevomat · Feb 2, 2025 · a7b07d4 · a7b07d4
1 parent cae7dc6
commit a7b07d4
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 5 deletions.
diff --git a/SlevomatCodingStandard/Sniffs/PHP/UselessParenthesesSniff.php b/SlevomatCodingStandard/Sniffs/PHP/UselessParenthesesSniff.php
@@ -23,9 +23,11 @@
 use const T_CASE;
 use const T_CLONE;
 use const T_CLOSE_PARENTHESIS;
+use const T_CLOSE_SHORT_ARRAY;
 use const T_CLOSURE;
 use const T_COALESCE;
 use const T_COLON;
+use const T_COMMA;
 use const T_CONSTANT_ENCAPSED_STRING;
 use const T_DIVIDE;
 use const T_DNUMBER;
@@ -169,7 +171,7 @@ public function process(File $phpcsFile, $parenthesisOpenerPointer): void
 		$pointerAfterParenthesisOpener = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
 		if (in_array(
 			$tokens[$pointerAfterParenthesisOpener]['code'],
-			[T_NEW, T_CLONE, T_YIELD, T_YIELD_FROM, T_REQUIRE, T_REQUIRE_ONCE, T_INCLUDE, T_INCLUDE_ONCE, T_ARRAY_CAST],
+			[T_CLONE, T_YIELD, T_YIELD_FROM, T_REQUIRE, T_REQUIRE_ONCE, T_INCLUDE, T_INCLUDE_ONCE, T_ARRAY_CAST],
 			true,
 		)) {
 			return;
@@ -204,6 +206,7 @@ public function process(File $phpcsFile, $parenthesisOpenerPointer): void
 		$this->checkParenthesesAroundVariableOrFunctionCall($phpcsFile, $parenthesisOpenerPointer);
 		$this->checkParenthesesAroundString($phpcsFile, $parenthesisOpenerPointer);
 		$this->checkParenthesesAroundOperators($phpcsFile, $parenthesisOpenerPointer);
+		$this->checkParenthesesAroundNew($phpcsFile, $parenthesisOpenerPointer);
 	}
 
 	private function checkParenthesesAroundConditionInTernaryOperator(File $phpcsFile, int $parenthesisOpenerPointer): void
@@ -325,6 +328,12 @@ private function checkParenthesesAroundVariableOrFunctionCall(File $phpcsFile, i
 	{
 		$tokens = $phpcsFile->getTokens();
 
+		$newPointer = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
+		if ($tokens[$newPointer]['code'] === T_NEW) {
+			// Check in other method
+			return;
+		}
+
 		$operatorsPointers = TokenHelper::findNextAll(
 			$phpcsFile,
 			self::OPERATORS,
@@ -455,6 +464,12 @@ private function checkParenthesesAroundOperators(File $phpcsFile, int $parenthes
 	{
 		$tokens = $phpcsFile->getTokens();
 
+		$newPointer = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
+		if ($tokens[$newPointer]['code'] === T_NEW) {
+			// Check in other method
+			return;
+		}
+
 		$pointerBeforeParenthesisOpener = TokenHelper::findPreviousEffective($phpcsFile, $parenthesisOpenerPointer - 1);
 		$pointerAfterParenthesisCloser = TokenHelper::findNextEffective(
 			$phpcsFile,
@@ -585,4 +600,38 @@ private function checkParenthesesAroundOperators(File $phpcsFile, int $parenthes
 		$phpcsFile->fixer->endChangeset();
 	}
 
+	private function checkParenthesesAroundNew(File $phpcsFile, int $parenthesisOpenerPointer): void
+	{
+		$tokens = $phpcsFile->getTokens();
+
+		$newPointer = TokenHelper::findNextEffective($phpcsFile, $parenthesisOpenerPointer + 1);
+		if ($tokens[$newPointer]['code'] !== T_NEW) {
+			return;
+		}
+
+		$pointerAfterParenthesisCloser = TokenHelper::findNextEffective(
+			$phpcsFile,
+			$tokens[$parenthesisOpenerPointer]['parenthesis_closer'] + 1,
+		);
+		if (!in_array($tokens[$pointerAfterParenthesisCloser]['code'], [T_COMMA, T_SEMICOLON, T_CLOSE_SHORT_ARRAY], true)) {
+			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();
+
+		FixerHelper::removeBetweenIncluding($phpcsFile, $parenthesisOpenerPointer, $contentStartPointer - 1);
+		FixerHelper::removeBetweenIncluding($phpcsFile, $contentEndPointer + 1, $tokens[$parenthesisOpenerPointer]['parenthesis_closer']);
+
+		$phpcsFile->fixer->endChangeset();
+	}
+
 }
diff --git a/tests/Sniffs/PHP/UselessParenthesesSniffTest.php b/tests/Sniffs/PHP/UselessParenthesesSniffTest.php
@@ -17,9 +17,9 @@ public function testErrors(): void
 	{
 		$report = self::checkFile(__DIR__ . '/data/uselessParenthesesErrors.php');
 
-		self::assertSame(41, $report->getErrorCount());
+		self::assertSame(44, $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, 64] 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, 64, 67, 72] as $line) {
 			self::assertSniffError($report, $line, UselessParenthesesSniff::CODE_USELESS_PARENTHESES);
 		}
 

diff --git a/tests/Sniffs/PHP/data/uselessParenthesesErrors.fixed.php b/tests/Sniffs/PHP/data/uselessParenthesesErrors.fixed.php
@@ -59,6 +59,14 @@ function () {
 $x = $b + 100 - $c;
 $x = $b * 100 / $c;
 
+$remoteAddress = new RemoteAddress();
+$remotedAddresses = [
+	new RemoteAddress()
+];
+$remotedAddresses = [
+	new RemoteAddress(),
+];
+
 function () {
 	return [
 		'a' => 'aa' . 'bb',

diff --git a/tests/Sniffs/PHP/data/uselessParenthesesErrors.php b/tests/Sniffs/PHP/data/uselessParenthesesErrors.php
@@ -59,6 +59,14 @@ function () {
 $x = $b + (100 - $c);
 $x = $b * (100 / $c);
 
+$remoteAddress = (new RemoteAddress());
+$remotedAddresses = [
+	(new RemoteAddress())
+];
+$remotedAddresses = [
+	(new RemoteAddress()),
+];
+
 function () {
 	return [
 		'a' => ('aa' . 'bb'),

diff --git a/tests/Sniffs/PHP/data/uselessParenthesesNoErrors.php b/tests/Sniffs/PHP/data/uselessParenthesesNoErrors.php
@@ -80,8 +80,6 @@ public function __construct()
 	}
 }
 
-$response = (new Response())->withStatus(200);
-
 $a = $b / (100 + $c);
 $a = (100 - $b) * $c;
 $a = ('100' . '000') * $c;
@@ -179,6 +177,9 @@ function ($value) {
 
 echo 'Hello' . ($foo) ? ' There' : $fn();
 
+$response = (new Response())->withStatus(200);
+$ip = (new RemoteAddress())?->getIpAddress();
+
 // Must be last
 return true
 	? 100