ignore Doctrine repository return type provider on magic method patte…

…rn if already in repository #1481

src/main/java/fr/adrienbrault/idea/symfony2plugin/doctrine/ObjectRepositoryResultTypeProvider.java

@@ -162,6 +162,11 @@ private static Collection<? extends PhpNamedElement> getTypeSignatureMagic(@NotN
         for (String s : signature.split("\\|")) {
             int i = s.lastIndexOf(".");
             if (i > 0) {
+                // method already exists in repository use it
+                if (phpIndex.getBySignature(s, null, 0).size() > 0) {
+                    return Collections.emptyList();
+                }
+
                 String substring = s.substring(i + 1);
                 if (substring.startsWith("findOneBy")) {
                     s = s.substring(0, i + 1) + "findOneBy";

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/ObjectRepositoryResultTypeProviderTest.java

@@ -12,6 +12,7 @@
 public class ObjectRepositoryResultTypeProviderTest extends SymfonyLightCodeInsightFixtureTestCase {
     public void setUp() throws Exception {
         super.setUp();
+        myFixture.copyFileToProject("ObjectRepositoryResultTypeProvider.orm.yml");
         myFixture.copyFileToProject("ObjectRepositoryResultTypeProvider.php");
     }
 
@@ -75,4 +76,22 @@ public void testThatClassAsStringIsResolvedForMagicMethods() {
             PlatformPatterns.psiElement(Method.class).withName("getId")
         );
     }
+
+    public void testThatClassAsStringIsResolvedForMagicMethodsButNotWhenAlreadyExists() {
+        // do nothing at all here; use type from the method it self
+        assertPhpReferenceResolveTo(PhpFileType.INSTANCE,
+            "<?php" +
+                "/** @var \\Doctrine\\Common\\Persistence\\ObjectManager $om */\n" +
+                "$om->getRepository('\\Foo\\Bar')->findOneByFancyStuff('foobar')[0]->get<caret>Id();",
+            PlatformPatterns.psiElement(Method.class).withName("getId")
+        );
+
+        // repository class exists but method is magic
+        assertPhpReferenceResolveTo(PhpFileType.INSTANCE,
+            "<?php" +
+                "/** @var \\Doctrine\\Common\\Persistence\\ObjectManager $om */\n" +
+                "$om->getRepository('\\Foo\\Bar')->findOneByFancyStuffNotMagic('foobar')->get<caret>Id();",
+            PlatformPatterns.psiElement(Method.class).withName("getId")
+        );
+    }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.orm.yml

@@ -0,0 +1,6 @@
+Foo\Bar:
+  type: entity
+  repositoryClass: Foo\BarRepository
+  fields:
+    name:
+      type: string

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/doctrine/fixtures/ObjectRepositoryResultTypeProvider.php

@@ -2,12 +2,24 @@
 
 namespace Foo
 {
+    use Doctrine\Common\Persistence\ObjectRepository;
+
     class Bar
     {
         public function getId()
         {
         }
     }
+
+    class BarRepository implements ObjectRepository
+    {
+        public function find() {}
+
+        /**
+         * @return Bar[]
+         */
+        public function findOneByFancyStuff() {}
+    }
 }