Simplify detection of method inheritance (#677)

infection · Mar 29, 2019 · 1af42c6 · 1af42c6
1 parent 6f93609
commit 1af42c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 55 deletions.
diff --git a/src/Mutator/FunctionSignature/ProtectedVisibility.php b/src/Mutator/FunctionSignature/ProtectedVisibility.php
@@ -95,22 +95,10 @@ private function hasSameProtectedParentMethod(Node $node): bool
             return true;
         }
 
-        $parent = $reflection->getParentClass();
-
-        while ($parent) {
-            try {
-                $method = $parent->getMethod($node->name->name);
-
-                if ($method->isProtected()) {
-                    return true;
-                }
-            } catch (\ReflectionException $e) {
-                return false;
-            } finally {
-                $parent = $parent->getParentClass();
-            }
+        try {
+            return $reflection->getMethod($node->name->name)->getPrototype()->isProtected();
+        } catch (\ReflectionException $e) {
+            return false;
         }
-
-        return false;
     }
 }
diff --git a/src/Mutator/FunctionSignature/PublicVisibility.php b/src/Mutator/FunctionSignature/PublicVisibility.php
@@ -95,45 +95,10 @@ private function hasSamePublicParentMethod(Node $node): bool
             return true;
         }
 
-        return $this->hasSamePublicMethodInInterface($node, $reflection) || $this->hasSamePublicMethodInParentClass($node, $reflection);
-    }
-
-    private function hasSamePublicMethodInInterface(Node $node, \ReflectionClass $reflection): bool
-    {
-        foreach ($reflection->getInterfaces() as $reflectionInterface) {
-            try {
-                $method = $reflectionInterface->getMethod($node->name->name);
-
-                if ($method->isPublic()) {
-                    // we can't mutate because interface requires the same public visibility
-                    return true;
-                }
-            } catch (\ReflectionException $e) {
-                continue;
-            }
-        }
-
-        return false;
-    }
-
-    private function hasSamePublicMethodInParentClass(Node $node, \ReflectionClass $reflection): bool
-    {
-        $parent = $reflection->getParentClass();
-
-        while ($parent) {
-            try {
-                $method = $parent->getMethod($node->name->name);
-
-                if ($method->isPublic()) {
-                    return true;
-                }
-            } catch (\ReflectionException $e) {
-                return false;
-            } finally {
-                $parent = $parent->getParentClass();
-            }
+        try {
+            return $reflection->getMethod($node->name->name)->getPrototype()->isPublic();
+        } catch (\ReflectionException $e) {
+            return false;
         }
-
-        return false;
     }
 }