Apply node->isFirstCallable() check early before ->getArgs() when pos…

…sible on CallLike (#3038)
rectorphp · Nov 7, 2022 · 10346ee · 10346ee
1 parent 84361b8
commit 10346ee
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 3 deletions.
diff --git a/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php b/packages/NodeTypeResolver/PHPStan/ParametersAcceptorSelectorVariantsWrapper.php
@@ -20,6 +20,10 @@ public static function select(
     ): ParametersAcceptor {
         $variants = $reflection->getVariants();
 
+        if ($callLike->isFirstClassCallable()) {
+            return ParametersAcceptorSelector::selectSingle($variants);
+        }
+
         return count($variants) > 1
             ? ParametersAcceptorSelector::selectFromArgs($scope, $callLike->getArgs(), $variants)
             : ParametersAcceptorSelector::selectSingle($variants);

diff --git a/packages/PhpDocParser/NodeValue/NodeValueResolver/FuncCallValueResolver.php b/packages/PhpDocParser/NodeValue/NodeValueResolver/FuncCallValueResolver.php
@@ -42,7 +42,7 @@ public function resolve(Expr $expr, string $currentFilePath): mixed
             return dirname($currentFilePath);
         }
 
-        $args = $expr->getArgs();
+        $args = $expr->isFirstClassCallable() ? [] : $expr->getArgs();
         $arguments = [];
         foreach ($args as $arg) {
             $arguments[] = $this->constExprEvaluator->evaluateDirectly($arg->value);

diff --git a/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php b/rules/CodeQuality/Rector/FuncCall/ArrayKeysAndInArrayToArrayKeyExistsRector.php
@@ -62,6 +62,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         $args = $node->getArgs();
         $secondArg = $args[1];
 

diff --git a/rules/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector.php b/rules/CodeQuality/Rector/FuncCall/ChangeArrayPushToArrayAssignRector.php
@@ -64,6 +64,10 @@ public function refactor(Node $node): ?array
             return null;
         }
 
+        if ($funcCall->isFirstClassCallable()) {
+            return null;
+        }
+
         if ($this->hasArraySpread($funcCall)) {
             return null;
         }

diff --git a/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php b/rules/CodeQuality/Rector/FuncCall/CompactToVariablesRector.php
@@ -85,6 +85,10 @@ public function refactor(Node $node): ?Node
             return $this->compactConverter->convertToArray($node);
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         $firstArg = $node->getArgs()[0];
 
         $firstValue = $firstArg->value;

diff --git a/rules/CodeQuality/Rector/FuncCall/InlineIsAInstanceOfRector.php b/rules/CodeQuality/Rector/FuncCall/InlineIsAInstanceOfRector.php
@@ -67,6 +67,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         $args = $node->getArgs();
         $firstArgValue = $args[0]->value;
 

diff --git a/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php b/rules/DeadCode/Rector/Assign/RemoveUnusedVariableAssignRector.php
@@ -197,6 +197,10 @@ private function isUsedInAssignExpr(CallLike | Expr $expr, Assign $assign): bool
             return $this->isUsedInPreviousAssign($assign, $expr);
         }
 
+        if ($expr->isFirstClassCallable()) {
+            return false;
+        }
+
         foreach ($expr->getArgs() as $arg) {
             $variable = $arg->value;
 

diff --git a/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php b/rules/DeadCode/Rector/ClassMethod/RemoveUnusedPrivateMethodParameterRector.php
@@ -141,6 +141,10 @@ private function removeCallerArgs(Class_ $class, ClassMethod $classMethod, array
      */
     private function cleanupArgs(MethodCall $methodCall, array $keysArg): void
     {
+        if ($methodCall->isFirstClassCallable()) {
+            return;
+        }
+
         $args = $methodCall->getArgs();
         foreach (array_keys($args) as $key) {
             if (in_array($key, $keysArg, true)) {

diff --git a/rules/Naming/Matcher/VariableAndCallAssignMatcher.php b/rules/Naming/Matcher/VariableAndCallAssignMatcher.php
@@ -46,7 +46,7 @@ public function match(Assign $assign): ?VariableAndCallAssign
         }
 
         $isVariableFoundInCallArgs = (bool) $this->betterNodeFinder->findFirst(
-            $call->getArgs(),
+            $call->isFirstClassCallable() ? [] : $call->getArgs(),
             fn (Node $subNode): bool =>
                 $subNode instanceof Variable && $this->nodeNameResolver->isName($subNode, $variableName)
         );

diff --git a/rules/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector.php b/rules/Transform/Rector/FunctionLike/FileGetContentsAndJsonDecodeToStaticCallRector.php
@@ -13,6 +13,7 @@
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\Node\Stmt\Return_;
+use PhpParser\Node\VariadicPlaceholder;
 use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Transform\ValueObject\StaticCallRecipe;
@@ -113,7 +114,9 @@ private function createStaticCall(FuncCall $fileGetContentsFuncCall): StaticCall
         return new StaticCall(
             $fullyQualified,
             $this->staticCallRecipe->getMethodName(),
-            $fileGetContentsFuncCall->getArgs()
+            $fileGetContentsFuncCall->isFirstClassCallable()
+                ? [new VariadicPlaceholder()]
+                : $fileGetContentsFuncCall->getArgs()
         );
     }