[Visibility] Retarget ChangeMethodVisibilityRector to Class_ node

composer.json

@@ -72,7 +72,8 @@
         },
         "files": [
             "src/functions/node_helper.php",
-            "src/functions/rule_doc_generator_class_aliases.php"
+            "src/functions/rule_doc_generator_class_aliases.php",
+            "src/functions/rule_class_aliases.php"
         ]
     },
     "autoload-dev": {

rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php → rules-tests/Visibility/Rector/Class_/ChangeMethodVisibilityRector/ChangeMethodVisibilityRectorTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector;
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector;
 
 use Iterator;
 use PHPUnit\Framework\Attributes\DataProvider;

rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/Fixture/fixture.php.inc → rules-tests/Visibility/Rector/Class_/ChangeMethodVisibilityRector/Fixture/fixture.php.inc

@@ -1,8 +1,8 @@
 <?php
 
-namespace Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Fixture;
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Fixture;
 
-use Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Source\ParentObject;
+use Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source\ParentObject;
 
 class ClassThatInherits extends ParentObject
 {
@@ -21,9 +21,9 @@ class ClassThatInherits extends ParentObject
 -----
 <?php
 
-namespace Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Fixture;
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Fixture;
 
-use Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Source\ParentObject;
+use Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source\ParentObject;
 
 class ClassThatInherits extends ParentObject
 {

rules-tests/Visibility/Rector/Class_/ChangeMethodVisibilityRector/Fixture/fixture2.php.inc

@@ -0,0 +1,29 @@
+<?php
+
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Fixture;
+
+use Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source\ParentObject;
+
+class ClassThatInherits2 extends ParentObject
+{
+    static function toBePublicStaticMethod() {
+
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Fixture;
+
+use Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source\ParentObject;
+
+class ClassThatInherits2 extends ParentObject
+{
+    public static function toBePublicStaticMethod() {
+
+    }
+}
+
+?>

rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/Source/ParentObject.php → rules-tests/Visibility/Rector/Class_/ChangeMethodVisibilityRector/Source/ParentObject.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Source;
+namespace Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source;
 
 class ParentObject
 {

rules-tests/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector/config/configured_rule.php → rules-tests/Visibility/Rector/Class_/ChangeMethodVisibilityRector/config/configured_rule.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\Source\ParentObject;
+use Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\Source\ParentObject;
 use Rector\ValueObject\Visibility;
-use Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector;
+use Rector\Visibility\Rector\Class_\ChangeMethodVisibilityRector;
 use Rector\Visibility\ValueObject\ChangeMethodVisibility;
 
 return static function (RectorConfig $rectorConfig): void {

rules/Visibility/Rector/ClassMethod/ChangeMethodVisibilityRector.php → rules/Visibility/Rector/Class_/ChangeMethodVisibilityRector.php

@@ -2,13 +2,12 @@
 
 declare(strict_types=1);
 
-namespace Rector\Visibility\Rector\ClassMethod;
+namespace Rector\Visibility\Rector\Class_;
 
 use PhpParser\Node;
-use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Class_;
+use PHPStan\Reflection\ClassReflection;
 use Rector\Contract\Rector\ConfigurableRectorInterface;
-use Rector\NodeCollector\ScopeResolver\ParentClassScopeResolver;
-use Rector\PHPStan\ScopeFetcher;
 use Rector\Privatization\NodeManipulator\VisibilityManipulator;
 use Rector\Rector\AbstractRector;
 use Rector\RuleDoc\CodeSample\ConfiguredCodeSample;
@@ -18,7 +17,7 @@
 use Webmozart\Assert\Assert;
 
 /**
- * @see \Rector\Tests\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector\ChangeMethodVisibilityRectorTest
+ * @see \Rector\Tests\Visibility\Rector\Class_\ChangeMethodVisibilityRector\ChangeMethodVisibilityRectorTest
  */
 final class ChangeMethodVisibilityRector extends AbstractRector implements ConfigurableRectorInterface
 {
@@ -28,7 +27,6 @@ final class ChangeMethodVisibilityRector extends AbstractRector implements Confi
     private array $methodVisibilities = [];
 
     public function __construct(
-        private readonly ParentClassScopeResolver $parentClassScopeResolver,
         private readonly VisibilityManipulator $visibilityManipulator,
     ) {
     }
@@ -82,43 +80,51 @@ protected function someMethod()
      */
     public function getNodeTypes(): array
     {
-        return [ClassMethod::class];
+        return [Class_::class];
     }
 
     /**
-     * @param ClassMethod $node
+     * @param Class_ $node
      */
     public function refactor(Node $node): ?Node
     {
         if ($this->methodVisibilities === []) {
             return null;
         }
 
-        if (! $this->hasMatchingMethodName($node)) {
+        $classReflection = $this->getClassReflection($node);
+        if (! $classReflection instanceof ClassReflection) {
             return null;
         }
 
-        $scope = ScopeFetcher::fetch($node);
-        $parentClassName = $this->parentClassScopeResolver->resolveParentClassName($scope);
-        if ($parentClassName === null) {
+        $parentClassReflection = $classReflection->getParentClass();
+        if (! $parentClassReflection instanceof ClassReflection) {
             return null;
         }
 
-        foreach ($this->methodVisibilities as $methodVisibility) {
-            if ($methodVisibility->getClass() !== $parentClassName) {
-                continue;
-            }
+        $parentClassName = $parentClassReflection->getName();
 
-            if (! $this->isName($node, $methodVisibility->getMethod())) {
-                continue;
-            }
+        $hasChanged = false;
+        foreach ($node->getMethods() as $classMethod) {
+            foreach ($this->methodVisibilities as $methodVisibility) {
+                if ($methodVisibility->getClass() !== $parentClassName) {
+                    continue;
+                }
 
-            $this->visibilityManipulator->changeNodeVisibility($node, $methodVisibility->getVisibility());
+                if (! $this->isName($classMethod, $methodVisibility->getMethod())) {
+                    continue;
+                }
 
-            return $node;
+                $this->visibilityManipulator->changeNodeVisibility($classMethod, $methodVisibility->getVisibility());
+                $hasChanged = true;
+            }
         }
 
-        return null;
+        if (! $hasChanged) {
+            return null;
+        }
+
+        return $node;
     }
 
     /**
@@ -130,9 +136,4 @@ public function configure(array $configuration): void
 
         $this->methodVisibilities = $configuration;
     }
-
-    private function hasMatchingMethodName(ClassMethod $classMethod): bool
-    {
-        return array_any($this->methodVisibilities, fn (ChangeMethodVisibility $methodVisibility): bool => $this->isName($classMethod, $methodVisibility->getMethod()));
-    }
 }

src/NodeCollector/ScopeResolver/ParentClassScopeResolver.php

@@ -9,16 +9,6 @@
 
 final class ParentClassScopeResolver
 {
-    public function resolveParentClassName(Scope $scope): ?string
-    {
-        $parentClassReflection = $this->resolveParentClassReflection($scope);
-        if (! $parentClassReflection instanceof ClassReflection) {
-            return null;
-        }
-
-        return $parentClassReflection->getName();
-    }
-
     public function resolveParentClassReflection(Scope $scope): ?ClassReflection
     {
         $classReflection = $scope->getClassReflection();

src/functions/rule_class_aliases.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\DeadCode\Rector\Class_\RemoveParentDelegatingClassMethodRector;
+use Rector\TypeDeclaration\Rector\Class_\ReturnTypeFromMockObjectRector;
+use Rector\TypeDeclaration\Rector\ClassLike\AddVoidReturnTypeWhereNoReturnRector;
+use Rector\Visibility\Rector\Class_\ChangeMethodVisibilityRector;
+
+// backward-compatibility aliases for rules retargeted to Class_/ClassLike nodes and moved out of the ClassMethod namespace,
+// so configs and 3rd party sets referencing the former namespace keep working
+$ruleClassAliases = [
+    ChangeMethodVisibilityRector::class => 'Rector\Visibility\Rector\ClassMethod\ChangeMethodVisibilityRector',
+    RemoveParentDelegatingClassMethodRector::class => 'Rector\DeadCode\Rector\ClassMethod\RemoveParentDelegatingClassMethodRector',
+    ReturnTypeFromMockObjectRector::class => 'Rector\TypeDeclaration\Rector\ClassMethod\ReturnTypeFromMockObjectRector',
+    AddVoidReturnTypeWhereNoReturnRector::class => 'Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector',
+];
+
+foreach ($ruleClassAliases as $currentClass => $legacyClass) {
+    class_alias($currentClass, $legacyClass);
+}