[CodingStyle] Make MakeInheritedMethodVisibilitySameAsParentRector sk…

…ip magic methods and annotation methods (#137)
rectorphp · Jun 1, 2021 · 743738b · 743738b
1 parent ea1e88f
commit 743738b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/...od/MakeInheritedMethodVisibilitySameAsParentRector/Fixture/skip_method_annotation.php.inc b/...od/MakeInheritedMethodVisibilitySameAsParentRector/Fixture/skip_method_annotation.php.inc
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\Tests\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector\Fixture;
+
+use Rector\Tests\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector\Source\NoMethodAnnotationHere;
+
+/**
+ * @method some()
+ */
+final class SkipMethodAnnotation extends NoMethodAnnotationHere
+{
+}
diff --git a/...sMethod/MakeInheritedMethodVisibilitySameAsParentRector/Source/NoMethodAnnotationHere.php b/...sMethod/MakeInheritedMethodVisibilitySameAsParentRector/Source/NoMethodAnnotationHere.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\CodingStyle\Rector\ClassMethod\MakeInheritedMethodVisibilitySameAsParentRector\Source;
+
+abstract class NoMethodAnnotationHere
+{
+
+}
diff --git a/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php b/rules/CodingStyle/Rector/ClassMethod/MakeInheritedMethodVisibilitySameAsParentRector.php
@@ -78,6 +78,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node->isMagic()) {
+            return null;
+        }
+
         $scope = $node->getAttribute(AttributeKey::SCOPE);
         if (! $scope instanceof Scope) {
             // possibly trait
@@ -93,12 +97,13 @@ public function refactor(Node $node): ?Node
         $methodName = $this->getName($node->name);
 
         foreach ($classReflection->getParents() as $parentClassReflection) {
-            if (! $parentClassReflection->hasMethod($methodName)) {
+            $nativeClassReflection = $parentClassReflection->getNativeReflection();
+
+            // the class reflection aboves takes also @method annotations into an account
+            if (! $nativeClassReflection->hasMethod($methodName)) {
                 continue;
             }
 
-            $nativeClassReflection = $parentClassReflection->getNativeReflection();
-
             $parentReflectionMethod = $nativeClassReflection->getMethod($methodName);
             if ($this->isClassMethodCompatibleWithParentReflectionMethod($node, $parentReflectionMethod)) {
                 return null;