Updated Rector to commit 0bfd08d038d2932ff6efb6a210a8985ac6364afa

rectorphp/rector-src@0bfd08d [NodeTypeResolver] Handle namespaced function call name on NodeTypeResolver (#6564)
rectorphp · Dec 12, 2024 · 6e4ecfe · 6e4ecfe
1 parent c578222
commit 6e4ecfe
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '184eb2ed84405c011740792f1fee4e914e11b445';
+    public const PACKAGE_VERSION = '0bfd08d038d2932ff6efb6a210a8985ac6364afa';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2024-12-12 08:12:34';
+    public const RELEASE_DATE = '2024-12-12 16:24:52';
     /**
      * @var int
      */

diff --git a/src/NodeTypeResolver/NodeTypeResolver.php b/src/NodeTypeResolver/NodeTypeResolver.php
@@ -43,6 +43,7 @@
 use Rector\Configuration\RenamedClassesDataCollector;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\NodeAnalyzer\ClassAnalyzer;
+use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverAwareInterface;
 use Rector\NodeTypeResolver\Contract\NodeTypeResolverInterface;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -78,6 +79,10 @@ final class NodeTypeResolver
      * @readonly
      */
     private RenamedClassesDataCollector $renamedClassesDataCollector;
+    /**
+     * @readonly
+     */
+    private NodeNameResolver $nodeNameResolver;
     /**
      * @var string
      */
@@ -89,14 +94,15 @@ final class NodeTypeResolver
     /**
      * @param NodeTypeResolverInterface[] $nodeTypeResolvers
      */
-    public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, RenamedClassesDataCollector $renamedClassesDataCollector, iterable $nodeTypeResolvers)
+    public function __construct(ObjectTypeSpecifier $objectTypeSpecifier, ClassAnalyzer $classAnalyzer, GenericClassStringTypeCorrector $genericClassStringTypeCorrector, ReflectionProvider $reflectionProvider, AccessoryNonEmptyStringTypeCorrector $accessoryNonEmptyStringTypeCorrector, RenamedClassesDataCollector $renamedClassesDataCollector, NodeNameResolver $nodeNameResolver, iterable $nodeTypeResolvers)
     {
         $this->objectTypeSpecifier = $objectTypeSpecifier;
         $this->classAnalyzer = $classAnalyzer;
         $this->genericClassStringTypeCorrector = $genericClassStringTypeCorrector;
         $this->reflectionProvider = $reflectionProvider;
         $this->accessoryNonEmptyStringTypeCorrector = $accessoryNonEmptyStringTypeCorrector;
         $this->renamedClassesDataCollector = $renamedClassesDataCollector;
+        $this->nodeNameResolver = $nodeNameResolver;
         foreach ($nodeTypeResolvers as $nodeTypeResolver) {
             if ($nodeTypeResolver instanceof NodeTypeResolverAwareInterface) {
                 $nodeTypeResolver->autowire($this);
@@ -479,10 +485,11 @@ private function resolveNativeTypeWithBuiltinMethodCallFallback(Expr $expr, Scop
             if (!$expr->name instanceof Name) {
                 return $scope->getNativeType($expr);
             }
-            if (!$this->reflectionProvider->hasFunction($expr->name, $scope)) {
+            $functionName = new Name((string) $this->nodeNameResolver->getName($expr));
+            if (!$this->reflectionProvider->hasFunction($functionName, $scope)) {
                 return $scope->getNativeType($expr);
             }
-            $functionReflection = $this->reflectionProvider->getFunction($expr->name, $scope);
+            $functionReflection = $this->reflectionProvider->getFunction($functionName, $scope);
             if (!$functionReflection instanceof NativeFunctionReflection) {
                 return $scope->getNativeType($expr);
             }

diff --git a/src/PhpParser/AstResolver.php b/src/PhpParser/AstResolver.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\NullsafeMethodCall;
 use PhpParser\Node\Expr\StaticCall;
+use PhpParser\Node\Name;
 use PhpParser\Node\Param;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Class_;
@@ -340,10 +341,11 @@ private function resolveFunctionFromFuncCall(FuncCall $funcCall, Scope $scope) :
         if ($funcCall->name instanceof Expr) {
             return null;
         }
-        if (!$this->reflectionProvider->hasFunction($funcCall->name, $scope)) {
+        $functionName = new Name((string) $this->nodeNameResolver->getName($funcCall));
+        if (!$this->reflectionProvider->hasFunction($functionName, $scope)) {
             return null;
         }
-        $functionReflection = $this->reflectionProvider->getFunction($funcCall->name, $scope);
+        $functionReflection = $this->reflectionProvider->getFunction($functionName, $scope);
         return $this->resolveFunctionFromFunctionReflection($functionReflection);
     }
 }
diff --git a/src/Reflection/ReflectionResolver.php b/src/Reflection/ReflectionResolver.php
@@ -263,8 +263,9 @@ private function resolveFunctionReflectionFromFuncCall(FuncCall $funcCall)
         if (!$funcCall->name instanceof Name) {
             return null;
         }
-        if ($this->reflectionProvider->hasFunction($funcCall->name, $scope)) {
-            return $this->reflectionProvider->getFunction($funcCall->name, $scope);
+        $functionName = new Name((string) $this->nodeNameResolver->getName($funcCall));
+        if ($this->reflectionProvider->hasFunction($functionName, $scope)) {
+            return $this->reflectionProvider->getFunction($functionName, $scope);
         }
         return null;
     }