Fix few rules reporting in case of no change (#3090)

rectorphp · Nov 24, 2022 · 7842486 · 7842486
1 parent b981b37
commit 7842486
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 15 deletions.
diff --git a/rules/Removing/Rector/ClassMethod/ArgumentRemoverRector.php b/rules/Removing/Rector/ClassMethod/ArgumentRemoverRector.php
@@ -27,6 +27,8 @@ final class ArgumentRemoverRector extends AbstractRector implements Configurable
      */
     private array $removedArguments = [];
 
+    private bool $hasChanged = false;
+
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition(
@@ -60,8 +62,10 @@ public function getNodeTypes(): array
     /**
      * @param MethodCall|StaticCall|ClassMethod $node
      */
-    public function refactor(Node $node): MethodCall | StaticCall | ClassMethod
+    public function refactor(Node $node): MethodCall | StaticCall | ClassMethod | null
     {
+        $this->hasChanged = false;
+
         foreach ($this->removedArguments as $removedArgument) {
             if (! $this->nodeTypeResolver->isMethodStaticCallOrClassMethodObjectType(
                 $node,
@@ -77,7 +81,11 @@ public function refactor(Node $node): MethodCall | StaticCall | ClassMethod
             $this->processPosition($node, $removedArgument);
         }
 
-        return $node;
+        if ($this->hasChanged) {
+            return $node;
+        }
+
+        return null;
     }
 
     /**
@@ -119,6 +127,7 @@ private function processPosition(
         }
 
         if ($this->isArgumentValueMatch($node->args[$argumentRemover->getPosition()], $match)) {
+            $this->hasChanged = true;
             $this->nodeRemover->removeArg($node, $argumentRemover->getPosition());
         }
     }

diff --git a/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php b/rules/Renaming/Rector/PropertyFetch/RenamePropertyRector.php
@@ -30,6 +30,8 @@ final class RenamePropertyRector extends AbstractRector implements ConfigurableR
      */
     private array $renamedProperties = [];
 
+    private bool $hasChanged = false;
+
     public function getRuleDefinition(): RuleDefinition
     {
         return new RuleDefinition('Replaces defined old properties by new ones.', [
@@ -55,7 +57,15 @@ public function getNodeTypes(): array
     public function refactor(Node $node): ?Node
     {
         if ($node instanceof ClassLike) {
-            return $this->processFromClassLike($node);
+            foreach ($this->renamedProperties as $renamedProperty) {
+                $this->renameProperty($node, $renamedProperty);
+            }
+
+            if ($this->hasChanged) {
+                return $node;
+            }
+
+            return null;
         }
 
         return $this->processFromPropertyFetch($node);
@@ -70,15 +80,6 @@ public function configure(array $configuration): void
         $this->renamedProperties = $configuration;
     }
 
-    private function processFromClassLike(ClassLike $classLike): ClassLike
-    {
-        foreach ($this->renamedProperties as $renamedProperty) {
-            $this->renameProperty($classLike, $renamedProperty);
-        }
-
-        return $classLike;
-    }
-
     private function renameProperty(ClassLike $classLike, RenameProperty $renameProperty): void
     {
         $classLikeName = (string) $this->nodeNameResolver->getName($classLike);
@@ -105,6 +106,7 @@ private function renameProperty(ClassLike $classLike, RenameProperty $renameProp
             return;
         }
 
+        $this->hasChanged = true;
         $property->props[0]->name = new VarLikeIdentifier($newProperty);
     }
 

diff --git a/rules/Transform/Rector/ClassMethod/WrapReturnRector.php b/rules/Transform/Rector/ClassMethod/WrapReturnRector.php
@@ -84,7 +84,7 @@ public function refactor(Node $node): ?Node
             return $this->wrap($node, $typeMethodWrap->isArrayWrap());
         }
 
-        return $node;
+        return null;
     }
 
     /**

diff --git a/rules/Transform/Rector/StaticCall/StaticCallToNewRector.php b/rules/Transform/Rector/StaticCall/StaticCallToNewRector.php
@@ -86,7 +86,7 @@ public function refactor(Node $node): ?Node
             return new New_(new FullyQualified($class), $node->args);
         }
 
-        return $node;
+        return null;
     }
 
     /**

diff --git a/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php b/rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php
@@ -90,6 +90,10 @@ public function getNodeTypes(): array
      */
     public function refactorWithScope(Node $node, Scope $scope): ?Node
     {
+        if ($this->methodVisibilities === []) {
+            return null;
+        }
+
         $parentClassName = $this->parentClassScopeResolver->resolveParentClassName($scope);
         if ($parentClassName === null) {
             return null;
@@ -109,7 +113,7 @@ public function refactorWithScope(Node $node, Scope $scope): ?Node
             return $node;
         }
 
-        return $node;
+        return null;
     }
 
     /**