Remove type-hiding name methods (#5912)

Co-authored-by: kaizen-ci <[email protected]>

packages/NodeNameResolver/NodeNameResolver.php

@@ -7,12 +7,10 @@
 use Nette\Utils\Strings;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
-use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
-use PhpParser\Node\Expr\StaticPropertyFetch;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -184,22 +182,6 @@ public function getNames(array $nodes): array
         return $names;
     }
 
-    /**
-     * @param Node[] $nodes
-     */
-    public function haveName(array $nodes, string $name): bool
-    {
-        foreach ($nodes as $node) {
-            if (! $this->isName($node, $name)) {
-                continue;
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
     public function isLocalPropertyFetchNamed(Node $node, string $name): bool
     {
         if (! $node instanceof PropertyFetch) {
@@ -221,27 +203,6 @@ public function isLocalPropertyFetchNamed(Node $node, string $name): bool
         return $this->isName($node->name, $name);
     }
 
-    public function isLocalStaticPropertyFetchNamed(Node $node, string $name): bool
-    {
-        if (! $node instanceof StaticPropertyFetch) {
-            return false;
-        }
-
-        return $this->isName($node->name, $name);
-    }
-
-    /**
-     * @param string[] $names
-     */
-    public function isFuncCallNames(Node $node, array $names): bool
-    {
-        if (! $node instanceof FuncCall) {
-            return false;
-        }
-
-        return $this->isNames($node, $names);
-    }
-
     /**
      * Ends with ucname
      * Starts with adjective, e.g. (Post $firstPost, Post $secondPost)
@@ -287,18 +248,6 @@ public function isLocalMethodCallsNamed(Node $node, array $names): bool
         return false;
     }
 
-    /**
-     * @deprecated Helper function causes to lose the type on the outside. Better avoid it
-     */
-    public function isFuncCallName(Node $node, string $name): bool
-    {
-        if (! $node instanceof FuncCall) {
-            return false;
-        }
-
-        return $this->isName($node, $name);
-    }
-
     /**
      * @deprecated Helper function causes to lose the type on the outside. Better avoid it
      */
@@ -319,33 +268,6 @@ public function isStaticCallNamed(Node $node, string $className, string $methodN
         return $this->isName($node->name, $methodName);
     }
 
-    /**
-     * @deprecated Helper function causes to lose the type on the outside. Better avoid it
-     * @param string[] $methodNames
-     */
-    public function isStaticCallsNamed(Node $node, string $className, array $methodNames): bool
-    {
-        foreach ($methodNames as $methodName) {
-            if ($this->isStaticCallNamed($node, $className, $methodName)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @deprecated Helper function causes to lose the type on the outside. Better avoid it
-     */
-    public function isVariableName(Node $node, string $name): bool
-    {
-        if (! $node instanceof Variable) {
-            return false;
-        }
-
-        return $this->isName($node, $name);
-    }
-
     /**
      * @param ObjectType[] $desiredObjectTypes
      */

packages/VendorLocker/NodeVendorLocker/ClassMethodParamVendorLockResolver.php

@@ -4,27 +4,16 @@
 
 namespace Rector\VendorLocker\NodeVendorLocker;
 
+use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\ClassReflection;
 use Rector\NodeCollector\NodeCollector\NodeRepository;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\VendorLocker\Reflection\ClassReflectionAncestorAnalyzer;
-use Rector\VendorLocker\Reflection\MethodReflectionContractAnalyzer;
 
 final class ClassMethodParamVendorLockResolver
 {
-    /**
-     * @var ClassReflectionAncestorAnalyzer
-     */
-    private $classReflectionAncestorAnalyzer;
-
-    /**
-     * @var MethodReflectionContractAnalyzer
-     */
-    private $methodReflectionContractAnalyzer;
-
     /**
      * @var NodeNameResolver
      */
@@ -35,14 +24,8 @@ final class ClassMethodParamVendorLockResolver
      */
     private $nodeRepository;
 
-    public function __construct(
-        ClassReflectionAncestorAnalyzer $classReflectionAncestorAnalyzer,
-        MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer,
-        NodeNameResolver $nodeNameResolver,
-        NodeRepository $nodeRepository
-    ) {
-        $this->classReflectionAncestorAnalyzer = $classReflectionAncestorAnalyzer;
-        $this->methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer;
+    public function __construct(NodeNameResolver $nodeNameResolver, NodeRepository $nodeRepository)
+    {
         $this->nodeNameResolver = $nodeNameResolver;
         $this->nodeRepository = $nodeRepository;
     }
@@ -59,58 +42,36 @@ public function isVendorLocked(ClassMethod $classMethod, int $paramPosition): bo
             return false;
         }
 
-        if (! $this->classReflectionAncestorAnalyzer->hasAncestors($classReflection)) {
-            return false;
+        if ($classMethod->isMagic()) {
+            return true;
         }
 
         $methodName = $this->nodeNameResolver->getName($classMethod);
-
-        if ($classReflection->getParentClass() !== false) {
-            $vendorLock = $this->isParentClassVendorLocking(
-                $classReflection->getParentClass(),
-                $paramPosition,
-                $methodName
-            );
-            if ($vendorLock !== null) {
-                return $vendorLock;
+        foreach ($classReflection->getAncestors() as $ancestorClassReflection) {
+            // skip self
+            if ($ancestorClassReflection === $classReflection) {
+                continue;
             }
-        }
 
-        if ($classReflection->isClass()) {
-            return $this->methodReflectionContractAnalyzer->hasInterfaceContract($classReflection, $methodName);
-        }
-
-        if ($classReflection->isInterface()) {
-            return $this->methodReflectionContractAnalyzer->hasInterfaceContract($classReflection, $methodName);
-        }
+            if (! $ancestorClassReflection->hasNativeMethod($methodName)) {
+                continue;
+            }
 
-        return false;
-    }
+            // class is vendor, its locking us
+            $classLike = $this->nodeRepository->findClassLike($ancestorClassReflection->getName());
+            if (! $classLike instanceof ClassLike) {
+                return true;
+            }
 
-    private function isParentClassVendorLocking(
-        ClassReflection $parentClassReflection,
-        int $paramPosition,
-        string $methodName
-    ): ?bool {
-        $parentClass = $this->nodeRepository->findClass($parentClassReflection->getName());
-        if ($parentClass !== null) {
-            $parentClassMethod = $parentClass->getMethod($methodName);
-            // parent class method in local scope → it's ok
-            if ($parentClassMethod !== null) {
-                // parent method has no type → we cannot change it here
-                if (! isset($parentClassMethod->params[$paramPosition])) {
-                    return false;
-                }
-                return $parentClassMethod->params[$paramPosition]->type === null;
+            $classMethod = $classLike->getMethod($methodName);
+            if (! $classMethod instanceof ClassMethod) {
+                continue;
             }
-        }
 
-        if ($parentClassReflection->hasMethod($methodName)) {
-            // parent class method in external scope → it's not ok
-            // if not, look for it's parent parent
-            return true;
+            $paramType = $classMethod->params[$paramPosition]->type;
+            return $paramType !== null;
         }
 
-        return null;
+        return false;
     }
 }

packages/VendorLocker/NodeVendorLocker/ClassMethodReturnVendorLockResolver.php

@@ -11,16 +11,10 @@
 use PHPStan\Type\MixedType;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\VendorLocker\Reflection\ClassReflectionAncestorAnalyzer;
 use Rector\VendorLocker\Reflection\MethodReflectionContractAnalyzer;
 
 final class ClassMethodReturnVendorLockResolver
 {
-    /**
-     * @var ClassReflectionAncestorAnalyzer
-     */
-    private $classReflectionAncestorAnalyzer;
-
     /**
      * @var MethodReflectionContractAnalyzer
      */
@@ -32,11 +26,9 @@ final class ClassMethodReturnVendorLockResolver
     private $nodeNameResolver;
 
     public function __construct(
-        ClassReflectionAncestorAnalyzer $classReflectionAncestorAnalyzer,
         MethodReflectionContractAnalyzer $methodReflectionContractAnalyzer,
         NodeNameResolver $nodeNameResolver
     ) {
-        $this->classReflectionAncestorAnalyzer = $classReflectionAncestorAnalyzer;
         $this->methodReflectionContractAnalyzer = $methodReflectionContractAnalyzer;
         $this->nodeNameResolver = $nodeNameResolver;
     }
@@ -53,7 +45,7 @@ public function isVendorLocked(ClassMethod $classMethod): bool
             return false;
         }
 
-        if (! $this->classReflectionAncestorAnalyzer->hasAncestors($classReflection)) {
+        if (count($classReflection->getAncestors()) === 1) {
             return false;
         }
 

packages/VendorLocker/NodeVendorLocker/PropertyTypeVendorLockResolver.php

@@ -10,15 +10,9 @@
 use Rector\FamilyTree\Reflection\FamilyRelationsAnalyzer;
 use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\NodeTypeResolver\Node\AttributeKey;
-use Rector\VendorLocker\Reflection\ClassReflectionAncestorAnalyzer;
 
 final class PropertyTypeVendorLockResolver
 {
-    /**
-     * @var ClassReflectionAncestorAnalyzer
-     */
-    private $classReflectionAncestorAnalyzer;
-
     /**
      * @var NodeNameResolver
      */
@@ -30,11 +24,9 @@ final class PropertyTypeVendorLockResolver
     private $familyRelationsAnalyzer;
 
     public function __construct(
-        ClassReflectionAncestorAnalyzer $classReflectionAncestorAnalyzer,
         NodeNameResolver $nodeNameResolver,
         FamilyRelationsAnalyzer $familyRelationsAnalyzer
     ) {
-        $this->classReflectionAncestorAnalyzer = $classReflectionAncestorAnalyzer;
         $this->nodeNameResolver = $nodeNameResolver;
         $this->familyRelationsAnalyzer = $familyRelationsAnalyzer;
     }
@@ -49,7 +41,7 @@ public function isVendorLocked(Property $property): bool
             return false;
         }
 
-        if (! $this->classReflectionAncestorAnalyzer->hasAncestors($classReflection)) {
+        if (count($classReflection->getAncestors()) === 1) {
             return false;
         }
 

rules-tests/TypeDeclaration/Rector/FunctionLike/ParamTypeDeclarationRector/Fixture/local_scope_with_parent_class.php.inc

@@ -41,9 +41,6 @@ final class LocalChildClass extends AbstractLocalParentClass
     {
     }
 
-    /**
-     * @param int $number
-     */
     public function changeToo(int $number)
     {
     }