Merge pull request #1905 from Haehnchen/feature/1366-entity-metadata

#1366 mark EntityRepository classes as used code, if any metadata exists with them

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/codeInsight/SymfonyImplicitUsageProvider.java

@@ -7,6 +7,7 @@
 import com.jetbrains.php.lang.psi.elements.*;
 import de.espend.idea.php.annotation.dict.PhpDocCommentAnnotation;
 import de.espend.idea.php.annotation.util.AnnotationUtil;
+import fr.adrienbrault.idea.symfony2plugin.doctrine.metadata.util.DoctrineMetadataUtil;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
 import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
@@ -38,12 +39,18 @@ public boolean isImplicitUsage(@NotNull PsiElement element) {
                 || isCommandAndService((PhpClass) element)
                 || isSubscribedEvent((PhpClass) element)
                 || isVoter((PhpClass) element)
-                || isTwigExtension((PhpClass) element);
+                || isTwigExtension((PhpClass) element)
+                || isEntityRepository((PhpClass) element);
         }
 
         return false;
     }
 
+    private boolean isEntityRepository(@NotNull PhpClass phpClass) {
+        return PhpElementsUtil.isInstanceOf(phpClass, "\\Doctrine\\ORM\\EntityRepository")
+            && DoctrineMetadataUtil.findMetadataForRepositoryClass(phpClass).size() > 0;
+    }
+
     private boolean isTwigExtension(PhpClass phpClass) {
         if ((PhpElementsUtil.isInstanceOf(phpClass, "\\Twig\\Extension\\ExtensionInterface") || PhpElementsUtil.isInstanceOf(phpClass,"\\Twig_ExtensionInterface")) && ServiceUtil.isPhpClassAService(phpClass)) {
             Set<String> methods = new HashSet<>();

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInsight/SymfonyImplicitUsageProviderTest.java

@@ -147,6 +147,16 @@ public void testVoterRegisteredAsServiceAreMarkedUsed() {
         assertTrue(new SymfonyImplicitUsageProvider().isImplicitUsage(firstClassFromFile));
     }
 
+    public void testEntityRepositoryInsideDoctrineMetadataIsMarkedAsUsed() {
+        PsiFile psiFile = myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "namespace App\\Repository;\n" +
+            "class MyFoobarEntityRepository extends \\Doctrine\\ORM\\EntityRepository {}\n"
+        );
+
+        PhpClass firstClassFromFile = PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile.getContainingFile());
+        assertTrue(new SymfonyImplicitUsageProvider().isImplicitUsage(firstClassFromFile));
+    }
+
     public void testEventSubscriberGetSubscribedEventsArray() {
         PsiFile psiFile = myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
             "<?php\n" +

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInsight/fixtures/classes.php

@@ -38,4 +38,29 @@ interface ExtensionInterface
         public function getFilters();
         public function getFunctions();
     }
-}
+}
+
+namespace Doctrine\ORM
+{
+    class EntityRepository
+    {
+    }
+}
+
+namespace Doctrine\ORM\Mapping
+{
+    class Entity {};
+}
+
+namespace App\Entity
+{
+    use Doctrine\ORM\Mapping AS ORM;
+
+    /**
+     * @ORM\Entity(repositoryClass="App\Repository\MyFoobarEntityRepository")
+     */
+    class FooEntity
+    {
+    }
+}
+