[DX] remove isStaticCallNamed() (#5913)

Co-authored-by: kaizen-ci <[email protected]>
rectorphp · Mar 20, 2021 · 9d101f6 · 9d101f6
1 parent c01d969
commit 9d101f6
Show file tree

Hide file tree

Showing 15 changed files with 200 additions and 123 deletions.
diff --git a/packages/NodeNameResolver/NodeNameResolver.php b/packages/NodeNameResolver/NodeNameResolver.php
@@ -8,7 +8,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\MethodCall;
-use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\PropertyFetch;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
@@ -213,61 +212,6 @@ public function endsWith(string $currentName, string $expectedName): bool
         return (bool) Strings::match($currentName, $suffixNamePattern);
     }
 
-    public function isLocalMethodCallNamed(Node $node, string $name): bool
-    {
-        if (! $node instanceof MethodCall) {
-            return false;
-        }
-
-        if ($node->var instanceof StaticCall) {
-            return false;
-        }
-
-        if ($node->var instanceof MethodCall) {
-            return false;
-        }
-
-        if (! $this->isName($node->var, 'this')) {
-            return false;
-        }
-
-        return $this->isName($node->name, $name);
-    }
-
-    /**
-     * @param string[] $names
-     */
-    public function isLocalMethodCallsNamed(Node $node, array $names): bool
-    {
-        foreach ($names as $name) {
-            if ($this->isLocalMethodCallNamed($node, $name)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * @deprecated Helper function causes to lose the type on the outside. Better avoid it
-     */
-    public function isStaticCallNamed(Node $node, string $className, string $methodName): bool
-    {
-        if (! $node instanceof StaticCall) {
-            return false;
-        }
-
-        if ($node->class instanceof New_) {
-            if (! $this->isName($node->class->class, $className)) {
-                return false;
-            }
-        } elseif (! $this->isName($node->class, $className)) {
-            return false;
-        }
-
-        return $this->isName($node->name, $methodName);
-    }
-
     /**
      * @param ObjectType[] $desiredObjectTypes
      */

diff --git a/rules/CakePHP/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php b/rules/CakePHP/Rector/Namespace_/AppUsesStaticCallToUseStatementRector.php
@@ -9,6 +9,7 @@
 use PhpParser\Node\Stmt\Declare_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Use_;
+use PHPStan\Type\ObjectType;
 use Rector\CakePHP\Naming\CakePHPFullyQualifiedClassNameResolver;
 use Rector\Core\PhpParser\Node\CustomNode\FileWithoutNamespace;
 use Rector\Core\Rector\AbstractRector;
@@ -94,7 +95,12 @@ private function collectAppUseStaticCalls(Node $node): array
                 return false;
             }
 
-            return $this->nodeNameResolver->isStaticCallNamed($node, 'App', 'uses');
+            $callerType = $this->nodeTypeResolver->resolve($node->class);
+            if (! $callerType->isSuperTypeOf(new ObjectType('App'))->yes()) {
+                return false;
+            }
+
+            return $this->isName($node->name, 'uses');
         });
 
         return $appUsesStaticCalls;

diff --git a/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php b/rules/CodeQualityStrict/Rector/If_/MoveOutMethodCallInsideIfConditionRector.php
@@ -167,6 +167,7 @@ private function isVariableNameAlreadyDefined(If_ $if, string $variableName): bo
             return false;
         }
 
-        return $scope->hasVariableType($variableName)->yes();
+        return $scope->hasVariableType($variableName)
+            ->yes();
     }
 }
diff --git a/rules/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector.php b/rules/DependencyInjection/Rector/ClassMethod/AddMethodParentCallRector.php
@@ -5,6 +5,7 @@
 namespace Rector\DependencyInjection\Rector\ClassMethod;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
@@ -139,7 +140,15 @@ private function hasParentCallOfMethod(ClassMethod $classMethod, string $method)
         return (bool) $this->betterNodeFinder->findFirst((array) $classMethod->stmts, function (Node $node) use (
             $method
         ): bool {
-            return $this->nodeNameResolver->isStaticCallNamed($node, 'parent', $method);
+            if (! $node instanceof StaticCall) {
+                return false;
+            }
+
+            if (! $this->isName($node->class, 'parent')) {
+                return false;
+            }
+
+            return $this->isName($node->name, $method);
         });
     }
 }
diff --git a/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php b/rules/MockeryToProphecy/Rector/ClassMethod/MockeryCreateMockToProphizeRector.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\ClassMethod;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Rector\MockeryToProphecy\Collector\MockVariableCollector;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -96,12 +97,21 @@ private function replaceMockCreationsAndCollectVariableNames(ClassMethod $classM
         }
 
         $this->traverseNodesWithCallable($classMethod->stmts, function (Node $node): ?MethodCall {
-            if (! $this->nodeNameResolver->isStaticCallNamed($node, 'Mockery', 'mock')) {
+            if (! $node instanceof StaticCall) {
+                return null;
+            }
+
+            $callerType = $this->nodeTypeResolver->resolve($node->class);
+            if (! $callerType->isSuperTypeOf(new ObjectType('Mockery'))->yes()) {
+                return null;
+            }
+
+            if (! $this->isName($node->name, 'mock')) {
                 return null;
             }
 
-            /** @var StaticCall $node */
             $collectedVariableTypesByNames = $this->mockVariableCollector->collectMockVariableName($node);
+
             $this->mockVariableTypesByNames = array_merge(
                 $this->mockVariableTypesByNames,
                 $collectedVariableTypesByNames

diff --git a/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php b/rules/MockeryToProphecy/Rector/StaticCall/MockeryCloseRemoveRector.php
@@ -6,6 +6,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Rector\PHPUnit\NodeAnalyzer\TestsNodeAnalyzer;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
@@ -43,7 +44,12 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $this->nodeNameResolver->isStaticCallNamed($node, 'Mockery', 'close')) {
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
+        if (! $callerType->isSuperTypeOf(new ObjectType('Mockery'))->yes()) {
+            return null;
+        }
+
+        if (! $this->isName($node->name, 'close')) {
             return null;
         }
 

diff --git a/rules/PHPOffice/Rector/StaticCall/ChangeChartRendererRector.php b/rules/PHPOffice/Rector/StaticCall/ChangeChartRendererRector.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\StaticCall;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -58,7 +59,12 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_Settings', 'setChartRenderer')) {
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
+        if (! $callerType->isSuperTypeOf(new ObjectType('PHPExcel_Settings'))->yes()) {
+            return null;
+        }
+
+        if (! $this->nodeNameResolver->isName($node->name, 'setChartRenderer')) {
             return null;
         }
 

diff --git a/rules/PHPOffice/Rector/StaticCall/ChangeDataTypeForValueRector.php b/rules/PHPOffice/Rector/StaticCall/ChangeDataTypeForValueRector.php
@@ -7,6 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name\FullyQualified;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -60,7 +61,12 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_Cell_DataType', 'dataTypeForValue')) {
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
+        if (! $callerType->isSuperTypeOf(new ObjectType('PHPExcel_Cell_DataType'))->yes()) {
+            return null;
+        }
+
+        if (! $this->nodeNameResolver->isName($node->name, 'dataTypeForValue')) {
             return null;
         }
 

diff --git a/rules/PHPOffice/Rector/StaticCall/ChangePdfWriterRector.php b/rules/PHPOffice/Rector/StaticCall/ChangePdfWriterRector.php
@@ -9,6 +9,8 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name\FullyQualified;
+use PHPStan\Type\ObjectType;
+use PHPStan\Type\Type;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -62,17 +64,17 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if ($this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_Settings', 'setPdfRendererName')) {
-            $this->removeNode($node);
-            return null;
-        }
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
 
-        if ($this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_Settings', 'setPdfRenderer')) {
+        if ($this->isSettingsPdfRendererStaticCall($callerType, $node)) {
             $this->removeNode($node);
             return null;
         }
 
-        if ($this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_IOFactory', 'createWriter')) {
+        if ($callerType->isSuperTypeOf(new ObjectType('PHPExcel_IOFactory'))->yes() && $this->nodeNameResolver->isName(
+            $node->name,
+            'createWriter'
+        )) {
             if (! isset($node->args[1])) {
                 return null;
             }
@@ -85,4 +87,13 @@ public function refactor(Node $node): ?Node
 
         return $node;
     }
+
+    private function isSettingsPdfRendererStaticCall(Type $callerType, StaticCall $staticCall): bool
+    {
+        if (! $callerType->isSuperTypeOf(new ObjectType('PHPExcel_Settings'))->yes()) {
+            return false;
+        }
+
+        return $this->nodeNameResolver->isNames($staticCall->name, ['setPdfRendererName', 'setPdfRenderer']);
+    }
 }
diff --git a/rules/PHPOffice/Rector/StaticCall/ChangeSearchLocationToRegisterReaderRector.php b/rules/PHPOffice/Rector/StaticCall/ChangeSearchLocationToRegisterReaderRector.php
@@ -8,6 +8,7 @@
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name\FullyQualified;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -61,7 +62,12 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
-        if (! $this->nodeNameResolver->isStaticCallNamed($node, 'PHPExcel_IOFactory', 'addSearchLocation')) {
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
+        if (! $callerType->isSuperTypeOf(new ObjectType('PHPExcel_IOFactory'))->yes()) {
+            return null;
+        }
+
+        if (! $this->isName($node->name, 'addSearchLocation')) {
             return null;
         }
 

diff --git a/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php b/rules/Php70/Rector/ClassMethod/Php4ConstructorRector.php
@@ -5,6 +5,8 @@
 namespace Rector\Php70\Rector\ClassMethod;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
@@ -97,7 +99,7 @@ public function refactor(Node $node): ?Node
             /** @var Expression $stmt */
             $stmt = $node->stmts[0];
 
-            if ($this->nodeNameResolver->isLocalMethodCallNamed($stmt->expr, MethodName::CONSTRUCT)) {
+            if ($this->isLocalMethodCallNamed($stmt->expr, MethodName::CONSTRUCT)) {
                 $this->removeNode($node);
 
                 return null;
@@ -204,4 +206,25 @@ private function resolveParentClassName(StaticCall $staticCall): ?string
 
         return $parentClassReflection->getName();
     }
+
+    private function isLocalMethodCallNamed(Expr $expr, string $name): bool
+    {
+        if (! $expr instanceof MethodCall) {
+            return false;
+        }
+
+        if ($expr->var instanceof StaticCall) {
+            return false;
+        }
+
+        if ($expr->var instanceof MethodCall) {
+            return false;
+        }
+
+        if (! $this->isName($expr->var, 'this')) {
+            return false;
+        }
+
+        return $this->isName($expr->name, $name);
+    }
 }
diff --git a/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php b/rules/Php74/Rector/StaticCall/ExportToReflectionFunctionRector.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Name;
+use PHPStan\Type\ObjectType;
 use Rector\Core\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -57,7 +58,12 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $this->nodeNameResolver->isStaticCallNamed($node, 'ReflectionFunction', 'export')) {
+        $callerType = $this->nodeTypeResolver->resolve($node->class);
+        if (! $callerType->isSuperTypeOf(new ObjectType('ReflectionFunction'))->yes()) {
+            return null;
+        }
+
+        if (! $this->isName($node->name, 'export')) {
             return null;
         }