Merge pull request #1460 from Haehnchen/feature/service-cleanup

filter some special debug service and move the into lower priority

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/XmlService.java

@@ -103,13 +103,13 @@ public static XmlService createFromXml(@NotNull Element node) {
         if (id.startsWith(".")) {
             // <service id=".service_locator.XSes1R5" class="Symfony\Component\DependencyInjection\ServiceLocator" public="false">
             // <service id=".service_locator.tHpW6v3" alias=".service_locator.Y7gDuDN" public="false"/>
-            if (id.startsWith(".service_locator") && id.matches("^\\.service_locator.*\\.[\\w_]+$")) {
+            if (id.startsWith(".service_locator.") || id.startsWith(".abstract.") || id.startsWith(".instanceof.") || id.startsWith(".debug.") || id.startsWith(".errored.")) {
                 return null;
             }
 
             // <service id=".1_ArrayCache~kSL.YwK" class="Doctrine\Common\Cache\ArrayCache" public="false"/>
             // <service id=".2_~NpzP6Xn" public="false">
-            if (id.matches("^\\.[\\w]+_.*\\.[\\w_]+$") || id.matches("^\\.[\\w]+_~[\\w_]+$")) {
+            if (id.matches("^\\.[\\w-]+~.*$")) {
                 return null;
             }
         }

src/main/java/fr/adrienbrault/idea/symfony2plugin/dic/container/util/ServiceContainerUtil.java

@@ -625,9 +625,19 @@ public static int getServiceUsage(@NotNull Project project, @NotNull String id)
         return usage;
     }
 
-    public static boolean isLowerPriority(String name) {
-        for(String lowerName: LOWER_PRIORITY) {
-            if(name.contains(lowerName)) {
+    /**
+     * Move services done which are possible "garbage" or should not be taken like ".debug"
+     *
+     * - ".1_~NpzP6Xn"
+     *  - ".debug."
+     *  - "router.debug"
+     */
+    public static boolean isLowerPriority(@NotNull String name) {
+        for (String lowerName: LOWER_PRIORITY) {
+            // reduce the
+            // - ".1_~NpzP6Xn"
+            // -
+            if (name.startsWith(".") || name.contains("~") || name.toLowerCase().contains(lowerName)) {
                 return true;
             }
         }

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/dic/ServiceMapParserTest.java

@@ -26,9 +26,14 @@ public void testParse() throws Exception {
                 "<service id=\"translator\" alias=\"adrienbrault\"/>" +
                 "<service id=\"translator_private\" alias=\"adrienbrault\" public=\"false\"/>" +
                 "<service id=\".service_locator.SFX6J7Y\" class=\"Symfony\\Component\\DependencyInjection\\ServiceLocator\" public=\"false\"/>" +
+                "<service id=\".instanceof.SFX6J7Y\" class=\"Symfony\\Component\\DependencyInjection\\ServiceLocator\" public=\"false\"/>" +
+                "<service id=\".abstract.SFX6J7Y\" class=\"Symfony\\Component\\DependencyInjection\\ServiceLocator\" public=\"false\"/>" +
+                "<service id=\".debug.SFX6J7Y\" class=\"Symfony\\Component\\DependencyInjection\\ServiceLocator\" public=\"false\"/>" +
+                "<service id=\".errored.SFX6J7Y\" class=\"Symfony\\Component\\DependencyInjection\\ServiceLocator\" public=\"false\"/>" +
                 "<service id=\"Psr\\Log\\LoggerInterface $securityLogger\" alias=\"monolog.logger.security\"/>" +
                 "<service id=\".1_~NpzP6Xn\" public=\"false\"/>" +
                 "<service id=\".2_PhpArrayAdapter~kSL.YwK\" class=\"Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter\" public=\"false\"/>" +
+                "<service id=\".1_RouteLoaderContainer~Na7uo_Q\" class=\"Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter\" public=\"false\"/>" +
             "</container>";
 
         ServiceMap serviceMap = serviceMapParser.parse(new ByteArrayInputStream(xmlString.getBytes()));
@@ -56,5 +61,10 @@ public void testParse() throws Exception {
         assertEquals(0, serviceMap.getServices().stream().filter(s -> ".service_locator.SFX6J7Y".equals(s.getId())).count());
         assertEquals(0, serviceMap.getServices().stream().filter(s -> ".1_~NpzP6Xn".equals(s.getId())).count());
         assertEquals(0, serviceMap.getServices().stream().filter(s -> ".2_PhpArrayAdapter~kSL.YwK".equals(s.getId())).count());
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".1_RouteLoaderContainer~Na7uo_Q".equals(s.getId())).count());
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".abstract.SFX6J7Y".equals(s.getId())).count());
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".instanceof.SFX6J7Y".equals(s.getId())).count());
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".debug.SFX6J7Y".equals(s.getId())).count());
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".errored.SFX6J7Y".equals(s.getId())).count());
     }
 }