Merge pull request #1906 from Haehnchen/feature/1366-constraint-usage

#1366 mark Constraint classes used if validator class for it was found

Author: Haehnchen

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

@@ -14,10 +14,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,12 +37,24 @@ public boolean isImplicitUsage(@NotNull PsiElement element) {
                 || isSubscribedEvent((PhpClass) element)
                 || isVoter((PhpClass) element)
                 || isTwigExtension((PhpClass) element)
-                || isEntityRepository((PhpClass) element);
+                || isEntityRepository((PhpClass) element)
+                || isConstraint((PhpClass) element);
         }
 
         return false;
     }
 
+    private boolean isConstraint(@NotNull PhpClass phpClass) {
+        if(!PhpElementsUtil.isInstanceOf(phpClass, "\\Symfony\\Component\\Validator\\Constraint")) {
+            return false;
+        }
+
+        // class in same namespace
+        // @TODO: validateBy alias
+        String className = phpClass.getFQN() + "Validator";
+        return PhpElementsUtil.getClassesInterface(phpClass.getProject(), className).size() > 0;
+    }
+
     private boolean isEntityRepository(@NotNull PhpClass phpClass) {
         return PhpElementsUtil.isInstanceOf(phpClass, "\\Doctrine\\ORM\\EntityRepository")
             && DoctrineMetadataUtil.findMetadataForRepositoryClass(phpClass).size() > 0;

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

@@ -157,6 +157,16 @@ public void testEntityRepositoryInsideDoctrineMetadataIsMarkedAsUsed() {
         assertTrue(new SymfonyImplicitUsageProvider().isImplicitUsage(firstClassFromFile));
     }
 
+    public void testConstraintValidatorReferenceIsMarkedAsUsed() {
+        PsiFile psiFile = myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "namespace App\\Validator;\n" +
+            "class MyFoobarConstraint extends \\Symfony\\Component\\Validator\\Constraint {}\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

@@ -64,3 +64,20 @@ class FooEntity
     }
 }
 
+namespace Symfony\Component\Validator
+{
+    abstract class Constraint
+    {
+    }
+    interface ConstraintValidatorInterface
+    {
+    }
+}
+
+namespace App\Validator
+{
+    use Symfony\Component\Validator\Constraint;
+
+    class MyFoobarConstraintValidator extends Constraint {}
+}
+