Merge pull request #1609 from adamwojs/issue_1599

Fixed #1599: Added protection against infinite recursion in PhpElementsUtil.getImplementedMethods

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/util/PhpElementsUtil.java

@@ -575,15 +575,17 @@ static private PsiElement getArrayKeyValueInsideSignaturePsi(Project project, St
     }
 
     public static Method[] getImplementedMethods(@NotNull Method method) {
-        ArrayList<Method> items = getImplementedMethods(method.getContainingClass(), method, new ArrayList<>());
+        ArrayList<Method> items = getImplementedMethods(method.getContainingClass(), method, new ArrayList<>(), new HashSet<>());
         return items.toArray(new Method[items.size()]);
     }
 
-    private static ArrayList<Method> getImplementedMethods(@Nullable PhpClass phpClass, @NotNull Method method, ArrayList<Method> implementedMethods) {
-        if (phpClass == null) {
+    private static ArrayList<Method> getImplementedMethods(@Nullable PhpClass phpClass, @NotNull Method method, ArrayList<Method> implementedMethods, Set<PhpClass> visitedClasses) {
+        if (phpClass == null || visitedClasses.contains(phpClass)) {
             return implementedMethods;
         }
 
+        visitedClasses.add(phpClass);
+
         Method[] methods = phpClass.getOwnMethods();
         for (Method ownMethod : methods) {
             if (PhpLangUtil.equalsMethodNames(ownMethod.getName(), method.getName())) {
@@ -592,10 +594,10 @@ private static ArrayList<Method> getImplementedMethods(@Nullable PhpClass phpCla
         }
 
         for(PhpClass interfaceClass: phpClass.getImplementedInterfaces()) {
-            getImplementedMethods(interfaceClass, method, implementedMethods);
+            getImplementedMethods(interfaceClass, method, implementedMethods, visitedClasses);
         }
 
-        getImplementedMethods(phpClass.getSuperClass(), method, implementedMethods);
+        getImplementedMethods(phpClass.getSuperClass(), method, implementedMethods, visitedClasses);
 
         return implementedMethods;
     }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/util/PhpElementsUtilTest.java

@@ -2,6 +2,7 @@
 
 import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.ContainerUtil;
+import com.jetbrains.php.PhpIndex;
 import com.jetbrains.php.lang.PhpFileType;
 import com.jetbrains.php.lang.psi.PhpPsiElementFactory;
 import com.jetbrains.php.lang.psi.elements.*;
@@ -307,4 +308,20 @@ public void testThatPhpThatStringValueCanBeResolvedViaChainResolve() {
         assertContainsElements(PhpElementsUtil.StringResolver.findStringValues(PhpPsiElementFactory.createPhpPsiFromText(getProject(), ParameterList.class, "<?php $var = 'test.html'; foo($var);").getFirstPsiChild()), "test.html");
         assertContainsElements(PhpElementsUtil.StringResolver.findStringValues(PhpPsiElementFactory.createPhpPsiFromText(getProject(), TernaryExpression.class, "<?php $var = 'test.html'; $x = true == true ? $var : 'test2.html';")), "test.html", "test2.html");
     }
+
+    public void testGetImplementedMethodsForRecursiveClassHierarchy() {
+        myFixture.addFileToProject("First.php", "<?php class First extends Second { public function method() {} }");
+        myFixture.addFileToProject("Second.php", "<?php class Second extends First { public function method() {} }");
+
+        var firstClass = PhpIndex.getInstance(getProject()).getClassByName("First");
+        var secondClass = PhpIndex.getInstance(getProject()).getClassByName("Second");
+
+        var actualResult = PhpElementsUtil.getImplementedMethods(
+            secondClass.findOwnMethodByName("method")
+        );
+
+        assertSize(2, actualResult);
+        assertEquals(secondClass.findOwnMethodByName("method"), actualResult[0]);
+        assertEquals(firstClass.findOwnMethodByName("method"), actualResult[1]);
+    }
 }