Merge pull request #2937 from rectorphp/skip-public-abstract

skip open source class in remove unused param in open-source

rules/dead-code/src/Rector/ClassMethod/RemoveOverriddenValuesRector.php

@@ -94,6 +94,10 @@ public function refactor(Node $node): ?Node
         );
 
         $nodesToRemove = $this->resolveNodesToRemove($assignedVariableNames, $nodesByTypeAndPosition);
+        if ($nodesToRemove === []) {
+            return null;
+        }
+
         $this->removeNodes($nodesToRemove);
 
         return $node;

rules/dead-code/src/Rector/ClassMethod/RemoveUnusedParameterRector.php

@@ -21,6 +21,7 @@
  * @see https://www.php.net/manual/en/function.compact.php
  *
  * @see \Rector\DeadCode\Tests\Rector\ClassMethod\RemoveUnusedParameterRector\RemoveUnusedParameterRectorTest
+ * @see \Rector\DeadCode\Tests\Rector\ClassMethod\RemoveUnusedParameterRector\OpenSourceRectorTest
  */
 final class RemoveUnusedParameterRector extends AbstractRector
 {
@@ -127,6 +128,10 @@ public function refactor(Node $node): ?Node
         $childrenOfClass = $this->classLikeParsedNodesFinder->findChildrenOfClass($className);
         $unusedParameters = $this->getUnusedParameters($node, $methodName, $childrenOfClass);
 
+        if ($unusedParameters === []) {
+            return null;
+        }
+
         foreach ($childrenOfClass as $childClassNode) {
             $methodOfChild = $childClassNode->getMethod($methodName);
             if ($methodOfChild !== null) {
@@ -211,19 +216,35 @@ private function shouldSkip(ClassMethod $classMethod): bool
             return true;
         }
 
-        // skip as possible contract for 3rd party
-        $projetType = $this->parameterProvider->provideParameter(Option::PROJECT_TYPE);
-        if ($classMethod->isAbstract() && $projetType === Option::PROJECT_TYPE_OPEN_SOURCE) {
-            return true;
-        }
-
         $class = $classMethod->getAttribute(AttributeKey::CLASS_NODE);
-
         // skip interfaces and traits
         if (! $class instanceof Class_) {
             return true;
         }
 
+        if ($this->shouldSkipOpenSourceAbstract($classMethod, $class)) {
+            return true;
+        }
+
         return $this->isAnonymousClass($class);
     }
+
+    private function shouldSkipOpenSourceAbstract(ClassMethod $classMethod, Class_ $class): bool
+    {
+        // skip as possible contract for 3rd party
+        $projectType = $this->parameterProvider->provideParameter(Option::PROJECT_TYPE);
+        if ($projectType !== Option::PROJECT_TYPE_OPEN_SOURCE) {
+            return false;
+        }
+
+        if ($classMethod->isAbstract()) {
+            return true;
+        }
+
+        if (! $class->isAbstract()) {
+            return false;
+        }
+
+        return $classMethod->isPublic();
+    }
 }

rules/dead-code/tests/Rector/ClassMethod/RemoveUnusedParameterRector/FixtureOpenSource/skip_abstract_class.php.inc

@@ -0,0 +1,16 @@
+<?php
+
+namespace Rector\DeadCode\Tests\Rector\ClassMethod\RemoveUnusedParameterRector\FixtureOpenSource;
+
+abstract class SkipAbstractClass
+{
+    // free abstract method
+    public function foo(string $foo, string $bar)
+    {
+
+    }
+}
+
+class UsingAbstractClass extends SkipAbstractClass
+{
+}