Merge pull request #1901 from Haehnchen/feature/1366-commands-used

#1366 mark command class register as service as used code

Author: Haehnchen

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

@@ -9,6 +9,8 @@
 import de.espend.idea.php.annotation.dict.PhpDocCommentAnnotation;
 import de.espend.idea.php.annotation.util.AnnotationUtil;
 import fr.adrienbrault.idea.symfony2plugin.routing.RouteHelper;
+import fr.adrienbrault.idea.symfony2plugin.util.PhpElementsUtil;
+import fr.adrienbrault.idea.symfony2plugin.util.dict.ServiceUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
@@ -27,15 +29,25 @@ public boolean isImplicitUsage(@NotNull PsiElement element) {
         if (element instanceof Method && ((Method) element).getAccess() == PhpModifier.Access.PUBLIC) {
             return isMethodARoute((Method) element);
         } else if (element instanceof PhpClass) {
-            return ((PhpClass) element).getMethods()
-                .stream()
-                .filter(method -> method.getAccess() == PhpModifier.Access.PUBLIC)
-                .anyMatch(this::isMethodARoute);
+            return isRouteClass((PhpClass) element)
+                || isCommandAndService((PhpClass) element);
         }
 
         return false;
     }
 
+    private boolean isRouteClass(@NotNull PhpClass phpClass) {
+        return phpClass.getMethods()
+            .stream()
+            .filter(method -> method.getAccess() == PhpModifier.Access.PUBLIC)
+            .anyMatch(this::isMethodARoute);
+    }
+
+    private boolean isCommandAndService(PhpClass element) {
+        return PhpElementsUtil.isInstanceOf(element, "\\Symfony\\Component\\Console\\Command\\Command")
+            && ServiceUtil.isPhpClassAService(element);
+    }
+
     @Override
     public boolean isImplicitRead(@NotNull PsiElement element) {
         return false;

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

@@ -117,6 +117,26 @@ public void testControllerForDefinitionInsideYamlAsService() {
         )));
     }
 
+    public void testCommandRegisteredAsServiceAreMarkedUsed() {
+        PsiFile psiFile = myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "namespace App\\Command;\n" +
+            "class FooCommand extends \\Symfony\\Component\\Console\\Command\\Command {}"
+        );
+
+        PhpClass firstClassFromFile = PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile.getContainingFile());
+        assertTrue(new SymfonyImplicitUsageProvider().isImplicitUsage(firstClassFromFile));
+    }
+
+    public void testCommandRegisteredNotAsServiceIsUntouched() {
+        PsiFile psiFile = myFixture.configureByText(PhpFileType.INSTANCE, "<?php\n" +
+            "namespace App\\Command;\n" +
+            "class FoobarServiceCommand extends \\Symfony\\Component\\Console\\Command\\Command {}"
+        );
+
+        PhpClass firstClassFromFile = PhpElementsUtil.getFirstClassFromFile((PhpFile) psiFile.getContainingFile());
+        assertFalse(new SymfonyImplicitUsageProvider().isImplicitUsage(firstClassFromFile));
+    }
+
     private PhpClass createPhpControllerClassWithRouteContent(@NotNull String content) {
         return createPhpControllerClassWithRouteContent("\\App\\Controller\\FooController", content);
     }

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

@@ -6,4 +6,11 @@
      * @Annotation
      */
     class Route {}
+}
+
+namespace Symfony\Component\Console\Command
+{
+    class Command
+    {
+    }
 }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/codeInsight/fixtures/services.yml

@@ -3,4 +3,7 @@ services:
     class: App\Controller\FooControllerService
 
   foo_controller.service_invoke:
-    class: App\Controller\FooControllerServiceInvoke
+    class: App\Controller\FooControllerServiceInvoke
+
+  foo_command.foo_command:
+    class: App\Command\FooCommand