22
33declare (strict_types=1 );
44
5- namespace Rector \Visibility \Rector \ClassMethod ;
5+ namespace Rector \Visibility \Rector \Class_ ;
66
77use PhpParser \Node ;
8- use PhpParser \Node \Stmt \ClassMethod ;
8+ use PhpParser \Node \Stmt \Class_ ;
9+ use PHPStan \Reflection \ClassReflection ;
910use Rector \Contract \Rector \ConfigurableRectorInterface ;
10- use Rector \NodeCollector \ScopeResolver \ParentClassScopeResolver ;
11- use Rector \PHPStan \ScopeFetcher ;
1211use Rector \Privatization \NodeManipulator \VisibilityManipulator ;
1312use Rector \Rector \AbstractRector ;
1413use Rector \RuleDoc \CodeSample \ConfiguredCodeSample ;
1817use Webmozart \Assert \Assert ;
1918
2019/**
21- * @see \Rector\Tests\Visibility\Rector\ClassMethod \ChangeMethodVisibilityRector\ChangeMethodVisibilityRectorTest
20+ * @see \Rector\Tests\Visibility\Rector\Class_ \ChangeMethodVisibilityRector\ChangeMethodVisibilityRectorTest
2221 */
2322final class ChangeMethodVisibilityRector extends AbstractRector implements ConfigurableRectorInterface
2423{
@@ -28,7 +27,6 @@ final class ChangeMethodVisibilityRector extends AbstractRector implements Confi
2827 private array $ methodVisibilities = [];
2928
3029 public function __construct (
31- private readonly ParentClassScopeResolver $ parentClassScopeResolver ,
3230 private readonly VisibilityManipulator $ visibilityManipulator ,
3331 ) {
3432 }
@@ -82,43 +80,51 @@ protected function someMethod()
8280 */
8381 public function getNodeTypes (): array
8482 {
85- return [ClassMethod ::class];
83+ return [Class_ ::class];
8684 }
8785
8886 /**
89- * @param ClassMethod $node
87+ * @param Class_ $node
9088 */
9189 public function refactor (Node $ node ): ?Node
9290 {
9391 if ($ this ->methodVisibilities === []) {
9492 return null ;
9593 }
9694
97- if (! $ this ->hasMatchingMethodName ($ node )) {
95+ $ classReflection = $ this ->getClassReflection ($ node );
96+ if (! $ classReflection instanceof ClassReflection) {
9897 return null ;
9998 }
10099
101- $ scope = ScopeFetcher ::fetch ($ node );
102- $ parentClassName = $ this ->parentClassScopeResolver ->resolveParentClassName ($ scope );
103- if ($ parentClassName === null ) {
100+ $ parentClassReflection = $ classReflection ->getParentClass ();
101+ if (! $ parentClassReflection instanceof ClassReflection) {
104102 return null ;
105103 }
106104
107- foreach ($ this ->methodVisibilities as $ methodVisibility ) {
108- if ($ methodVisibility ->getClass () !== $ parentClassName ) {
109- continue ;
110- }
105+ $ parentClassName = $ parentClassReflection ->getName ();
111106
112- if (! $ this ->isName ($ node , $ methodVisibility ->getMethod ())) {
113- continue ;
114- }
107+ $ hasChanged = false ;
108+ foreach ($ node ->getMethods () as $ classMethod ) {
109+ foreach ($ this ->methodVisibilities as $ methodVisibility ) {
110+ if ($ methodVisibility ->getClass () !== $ parentClassName ) {
111+ continue ;
112+ }
115113
116- $ this ->visibilityManipulator ->changeNodeVisibility ($ node , $ methodVisibility ->getVisibility ());
114+ if (! $ this ->isName ($ classMethod , $ methodVisibility ->getMethod ())) {
115+ continue ;
116+ }
117117
118- return $ node ;
118+ $ this ->visibilityManipulator ->changeNodeVisibility ($ classMethod , $ methodVisibility ->getVisibility ());
119+ $ hasChanged = true ;
120+ }
119121 }
120122
121- return null ;
123+ if (! $ hasChanged ) {
124+ return null ;
125+ }
126+
127+ return $ node ;
122128 }
123129
124130 /**
@@ -130,9 +136,4 @@ public function configure(array $configuration): void
130136
131137 $ this ->methodVisibilities = $ configuration ;
132138 }
133-
134- private function hasMatchingMethodName (ClassMethod $ classMethod ): bool
135- {
136- return array_any ($ this ->methodVisibilities , fn (ChangeMethodVisibility $ methodVisibility ): bool => $ this ->isName ($ classMethod , $ methodVisibility ->getMethod ()));
137- }
138139}
0 commit comments