Merge pull request #1448 from Haehnchen/feature/service-filter

filter out service id which are random like service_locator from compiled service container file

Author: Haehnchen

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

@@ -95,6 +95,25 @@ public static XmlService createFromXml(@NotNull Element node) {
             return null;
         }
 
+        // <service id="Psr\Log\LoggerInterface $securityLogger" alias="monolog.logger.security"/>
+        if (id.contains(" $") && id.matches("^.*\\s\\$.*$")) {
+            return null;
+        }
+
+        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_]+$")) {
+                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_]+$")) {
+                return null;
+            }
+        }
+
         XmlService xmlService = new XmlService(id);
 
         String aClass = node.getAttribute("class");
@@ -103,7 +122,7 @@ public static XmlService createFromXml(@NotNull Element node) {
         }
 
         String isPublic = node.getAttribute("public");
-        if(isPublic != null && "false".equalsIgnoreCase(isPublic)) {
+        if("false".equalsIgnoreCase(isPublic)) {
             xmlService.isPublic = false;
         }
 

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

@@ -22,8 +22,13 @@ public void testParse() throws Exception {
             "<container>" +
                 "<service id=\"adrienbrault\" class=\"AdrienBrault\\Awesome\"/>" +
                 "<service id=\"secret\" class=\"AdrienBrault\\Secret\" public=\"false\"/>" +
+                "<service id=\".secret.test\" class=\"AdrienBrault\\Secret\" public=\"false\"/>" +
                 "<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=\"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\"/>" +
             "</container>";
 
         ServiceMap serviceMap = serviceMapParser.parse(new ByteArrayInputStream(xmlString.getBytes()));
@@ -44,5 +49,12 @@ public void testParse() throws Exception {
         assertFalse(
             serviceMap.getServices().stream().filter(s -> "secret".equals(s.getId())).findFirst().get().isPublic()
         );
+
+        assertEquals(1, serviceMap.getServices().stream().filter(s -> ".secret.test".equals(s.getId())).count());
+
+        assertEquals(0, serviceMap.getServices().stream().filter(s -> ".service_locator.SFX6J7Y".equals(s.getId())).count());
+        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());
     }
 }