Remove GetterNodeParamTypeInferer (#3108)

rectorphp · Nov 27, 2022 · f862bf9 · f862bf9
1 parent ca8249d
commit f862bf9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 208 deletions.
diff --git a/...TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/Fixture/from_getter.php.inc b/...TypeDeclaration/Rector/ClassMethod/AddArrayParamDocTypeRector/Fixture/from_getter.php.inc
diff --git a/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php b/rules/TypeDeclaration/TypeInferer/ParamTypeInferer/GetterNodeParamTypeInferer.php
diff --git a/src/NodeAnalyzer/PropertyFetchAnalyzer.php b/src/NodeAnalyzer/PropertyFetchAnalyzer.php
@@ -5,6 +5,7 @@
 namespace Rector\Core\NodeAnalyzer;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 use PhpParser\Node\Expr\Assign;
 use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\PropertyFetch;
@@ -208,14 +209,14 @@ public function isFilledViaMethodCallInConstructStmts(ClassLike $classLike, stri
     /**
      * @param string[] $propertyNames
      */
-    public function isLocalPropertyOfNames(Node $node, array $propertyNames): bool
+    public function isLocalPropertyOfNames(Expr $expr, array $propertyNames): bool
     {
-        if (! $this->isLocalPropertyFetch($node)) {
+        if (! $this->isLocalPropertyFetch($expr)) {
             return false;
         }
 
-        /** @var PropertyFetch $node */
-        return $this->nodeNameResolver->isNames($node->name, $propertyNames);
+        /** @var PropertyFetch $expr */
+        return $this->nodeNameResolver->isNames($expr->name, $propertyNames);
     }
 
     private function isPropertyAssignFoundInClassMethod(

diff --git a/src/NodeManipulator/PropertyFetchAssignManipulator.php b/src/NodeManipulator/PropertyFetchAssignManipulator.php
@@ -6,8 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\Assign;
-use PhpParser\Node\Expr\PropertyFetch;
-use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Property;
@@ -71,59 +69,4 @@ function (Node $node) use ($propertyName, $classLike, &$count): ?int {
 
         return $count === 2;
     }
-
-    /**
-     * @return string[]
-     */
-    public function getPropertyNamesOfAssignOfVariable(ClassMethod $classMethod, string $paramName): array
-    {
-        $propertyNames = [];
-
-        $this->simpleCallableNodeTraverser->traverseNodesWithCallable($classMethod, function (Node $node) use (
-            $paramName,
-            &$propertyNames
-        ) {
-            if (! $node instanceof Assign) {
-                return null;
-            }
-
-            if (! $this->isVariableAssignToThisPropertyFetch($node, $paramName)) {
-                return null;
-            }
-
-            /** @var Assign $node */
-            $propertyName = $this->nodeNameResolver->getName($node->expr);
-            if (is_string($propertyName)) {
-                $propertyNames[] = $propertyName;
-            }
-
-            return null;
-        });
-
-        return $propertyNames;
-    }
-
-    /**
-     * Matches:
-     * "$this->someValue = $<variableName>;"
-     */
-    private function isVariableAssignToThisPropertyFetch(Assign $assign, string $variableName): bool
-    {
-        if (! $assign->expr instanceof Variable) {
-            return false;
-        }
-
-        if (! $this->nodeNameResolver->isName($assign->expr, $variableName)) {
-            return false;
-        }
-
-        if (! $assign->var instanceof PropertyFetch) {
-            return false;
-        }
-
-        $propertyFetch = $assign->var;
-
-        // must be local property
-        return $this->nodeNameResolver->isName($propertyFetch->var, 'this');
-    }
 }