Fix resolving a field through a member

Author: cedricziel

src/main/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbasePersistenceReferenceResolver.java

@@ -34,7 +34,12 @@ public Collection<? extends PhpNamedElement> resolve(PhpReference phpReference)
             return Collections.emptyList();
         }
 
-        Collection<PhpClass> classesByFQN = PhpIndex.getInstance(phpReference.getProject()).getClassesByFQN(variable.getType().toStringResolved());
+        Collection<PhpClass> classesByFQN = new ArrayList<>();
+
+        for (String s: variable.getType().getTypes()) {
+            classesByFQN.addAll(PhpIndex.getInstance(phpReference.getProject()).getClassesByFQN(s));
+        }
+
         if (classesByFQN.isEmpty()) {
             return Collections.emptyList();
         }

src/test/java/com/cedricziel/idea/typo3/extbase/persistence/ExtbasePersistenceReferenceResolverTest.java

@@ -1,8 +1,15 @@
 package com.cedricziel.idea.typo3.extbase.persistence;
 
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import com.jetbrains.php.lang.psi.elements.Field;
+import com.jetbrains.php.lang.psi.elements.MethodReference;
+import com.jetbrains.php.lang.psi.elements.PhpNamedElement;
+import com.jetbrains.php.lang.psi.elements.PhpReference;
+import com.jetbrains.php.lang.psi.resolve.PhpReferenceResolver;
+
+import java.util.Collection;
 
 public class ExtbasePersistenceReferenceResolverTest extends LightCodeInsightFixtureTestCase {
     @Override
@@ -24,9 +31,25 @@ public void testCanNavigateToPropertiesFromMagicMethodsOnMembers() {
         myFixture.copyFileToProject("PersistenceMocks.php");
         myFixture.configureByFile("RepositoryMagicMethodNavigationOnMember.php");
 
-        PsiElement elementAtCaret = myFixture.getElementAtCaret();
+        int caretOffset = myFixture.getCaretOffset();
+        PsiElement elementAtCaret = myFixture.getFile().findElementAt(caretOffset).getParent();
 
-        assertInstanceOf(elementAtCaret, Field.class);
-        assertEquals("author", ((Field) elementAtCaret).getName());
+        assertInstanceOf(elementAtCaret, MethodReference.class);
+
+        for (PsiReference ref: elementAtCaret.getReferences()) {
+            if (ref instanceof PhpReference) {
+                for (PhpReferenceResolver resolver: PhpReferenceResolver.EP_NAME.getExtensions()) {
+                    Collection<? extends PhpNamedElement> resolve = resolver.resolve((PhpReference) ref);
+
+                    for (PhpNamedElement phpNamedElement: resolve) {
+                        if (phpNamedElement.getName().equals("author") && phpNamedElement instanceof Field) {
+                            return;
+                        }
+                    }
+                }
+            }
+        }
+
+        fail("Could not resolve to correct object");
     }
 }