[CodeQuality] More handling on Function/Static/Instantition callable …

…node on OptionalParametersAfterRequiredRector (#6558) * [CodeQuality] More handling on Function/Static/Instantition callable node on OptionalParametersAfterRequiredRector * [CodeQuality] More handling on Function/Static/Instantition callable node on OptionalParametersAfterRequiredRector * set * cs fix
rectorphp · Dec 11, 2024 · 7f9dae6 · 7f9dae6
1 parent cce5097
commit 7f9dae6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/...lParametersAfterRequiredRector/Fixture/skip_first_class_callable_in_call_function.php.inc b/...lParametersAfterRequiredRector/Fixture/skip_first_class_callable_in_call_function.php.inc
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterRequiredRector\Fixture;
+
+final class SkipFirstClassCallableInCallFunction
+{
+    public function getSubscribedEvents()
+    {
+        return textElement(...)->execute(...);
+    }
+
+    public function textElement()
+    {
+    }
+}
diff --git a/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php b/src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php
@@ -87,8 +87,11 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\ScopeContext;
+use PHPStan\Node\FunctionCallableNode;
+use PHPStan\Node\InstantiationCallableNode;
 use PHPStan\Node\MethodCallableNode;
 use PHPStan\Node\Printer\Printer;
+use PHPStan\Node\StaticMethodCallableNode;
 use PHPStan\Node\UnreachableStatementNode;
 use PHPStan\Node\VirtualNode;
 use PHPStan\Parser\ParserErrorsException;
@@ -386,13 +389,12 @@ public function processNodes(
                 return;
             }
 
-            if ($node instanceof MethodCallableNode) {
+            if ($node instanceof MethodCallableNode || $node instanceof FunctionCallableNode || $node instanceof StaticMethodCallableNode || $node instanceof InstantiationCallableNode) {
                 $node->getOriginalNode()
                     ->setAttribute(AttributeKey::SCOPE, $mutatingScope);
-                $node->getOriginalNode()
-                    ->var->setAttribute(AttributeKey::SCOPE, $mutatingScope);
-                $node->getOriginalNode()
-                    ->name->setAttribute(AttributeKey::SCOPE, $mutatingScope);
+                $this->processCallike($node->getOriginalNode(), $mutatingScope);
+
+                return;
             }
         };