[ci-review] Rector Rectify

rectorphp · Apr 15, 2021 · 4847022 · 4847022
1 parent b570bf9
commit 4847022
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php b/rules/Privatization/NodeAnalyzer/PropertyFetchByMethodAnalyzer.php
@@ -61,26 +61,23 @@ public function collectPropertyFetchByMethods(Class_ $class, array $propertyName
     {
         $propertyUsageByMethods = [];
 
-        foreach ($propertyNames as $privatePropertyName) {
+        foreach ($propertyNames as $propertyName) {
             foreach ($class->getMethods() as $classMethod) {
                 // assigned in constructor injection → skip
                 if ($this->nodeNameResolver->isName($classMethod, MethodName::CONSTRUCT)) {
                     return [];
                 }
 
-                if (! $this->propertyFetchAnalyzer->containsLocalPropertyFetchName(
-                    $classMethod,
-                    $privatePropertyName
-                )) {
+                if (! $this->propertyFetchAnalyzer->containsLocalPropertyFetchName($classMethod, $propertyName)) {
                     continue;
                 }
 
-                if ($this->isPropertyChangingInMultipleMethodCalls($classMethod, $privatePropertyName)) {
+                if ($this->isPropertyChangingInMultipleMethodCalls($classMethod, $propertyName)) {
                     continue;
                 }
 
                 $classMethodName = $this->nodeNameResolver->getName($classMethod);
-                $propertyUsageByMethods[$privatePropertyName][] = $classMethodName;
+                $propertyUsageByMethods[$propertyName][] = $classMethodName;
             }
         }
 

diff --git a/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php b/rules/Privatization/Rector/Class_/ChangeLocalPropertyToVariableRector.php
@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
-use Rector\Core\NodeAnalyzer\PropertyFetchAnalyzer;
 use Rector\Core\NodeManipulator\ClassManipulator;
 use Rector\Core\Rector\AbstractRector;
 use Rector\Privatization\NodeAnalyzer\PropertyFetchByMethodAnalyzer;
@@ -24,11 +23,6 @@ final class ChangeLocalPropertyToVariableRector extends AbstractRector
      */
     private $classManipulator;
 
-    /**
-     * @var PropertyFetchAnalyzer
-     */
-    private $propertyFetchAnalyzer;
-
     /**
      * @var PropertyFetchWithVariableReplacer
      */
@@ -41,12 +35,10 @@ final class ChangeLocalPropertyToVariableRector extends AbstractRector
 
     public function __construct(
         ClassManipulator $classManipulator,
-        PropertyFetchAnalyzer $propertyFetchAnalyzer,
         PropertyFetchWithVariableReplacer $propertyFetchWithVariableReplacer,
         PropertyFetchByMethodAnalyzer $propertyFetchByMethodAnalyzer
     ) {
         $this->classManipulator = $classManipulator;
-        $this->propertyFetchAnalyzer = $propertyFetchAnalyzer;
         $this->propertyFetchWithVariableReplacer = $propertyFetchWithVariableReplacer;
         $this->propertyFetchByMethodAnalyzer = $propertyFetchByMethodAnalyzer;
     }