NoUselessParenthesisFixer - fix for callable properties

kubawerlos · web-flow · commit ab7501d92e17 · 2021-09-17T19:36:55.000+02:00
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Latest stable version](https://img.shields.io/packagist/v/kubawerlos/php-cs-fixer-custom-fixers.svg?label=current%20version)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 [![PHP version](https://img.shields.io/packagist/php-v/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://php.net)
 [![License](https://img.shields.io/github/license/kubawerlos/php-cs-fixer-custom-fixers.svg)](LICENSE)
-![Tests](https://img.shields.io/badge/tests-2678-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-2681-brightgreen.svg)
 [![Downloads](https://img.shields.io/packagist/dt/kubawerlos/php-cs-fixer-custom-fixers.svg)](https://packagist.org/packages/kubawerlos/php-cs-fixer-custom-fixers)
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=main&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)
diff --git a/src/Fixer/NoUselessParenthesisFixer.php b/src/Fixer/NoUselessParenthesisFixer.php
@@ -105,6 +105,10 @@ private function isBlockToRemove(Tokens $tokens, int $startIndex, int $endIndex)
         /** @var Token $nextEndToken */
         $nextEndToken = $tokens[$nextEndIndex];
 
+        if ($nextEndToken->equals('(')) {
+            return false;
+        }
+
         if ($this->isForbiddenBeforeOpenParenthesis($tokens, $prevStartIndex)) {
             return false;
         }
diff --git a/tests/Fixer/NoUselessParenthesisFixerTest.php b/tests/Fixer/NoUselessParenthesisFixerTest.php
@@ -80,6 +80,9 @@ public function createStatic() {
                         return new static([1, 2]);
                     }
                 }'];
+        yield ['<?php return ($function)(42);'];
+        yield ['<?php return ($this->function)(42);'];
+        yield ['<?php return ($this->getFunction())(42);'];
 
         yield [
             '<?php return $bar;',

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@ public function createStatic() {`
`80`	`80`	`return new static([1, 2]);`
`81`	`81`	`}`
`82`	`82`	`}'];`
	`83`	`+ yield ['<?php return ($function)(42);'];`
	`84`	`+ yield ['<?php return ($this->function)(42);'];`
	`85`	`+ yield ['<?php return ($this->getFunction())(42);'];`
`83`	`86`
`84`	`87`	`yield [`
`85`	`88`	`'<?php return $bar;',`