Merge pull request Haehnchen#1293 from vdechenaux/fix_service_generation_class_bundle

Fix service generation when a class name contains "Bundle"and is not in a Bundle

Author: Haehnchen

src/main/java/fr/adrienbrault/idea/symfony2plugin/action/generator/naming/DefaultServiceNameStrategy.java

@@ -41,6 +41,10 @@ public String getServiceName(@NotNull ServiceNameStrategyParameter parameter) {
                 }
             }
 
+            if (x < 0) {
+                return formatParts(Arrays.asList(split));
+            }
+
             Collection<String> parts = new ArrayList<>();
             parts.add(StringUtils.join(Arrays.copyOfRange(split, 0, x), "_"));
 

src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/action/naming/DefaultServiceNameStrategyTest.java

@@ -32,6 +32,11 @@ public void testThatOnlyBundleInSubNamespaceShouldBeStripped() {
         assertEquals("foobar_foo_bar_foo_bar_fo.foo_bar.foo_bar", defaultNaming.getServiceName(getParameter("Foobar\\FooBar\\FooBar\\FoBundle\\FooBar\\FooBar")));
     }
 
+    public void testThatServiceNotInBundleCanContainBundleWord() {
+        DefaultServiceNameStrategy defaultNaming = new DefaultServiceNameStrategy();
+        assertEquals("foo.foo_bar.search_bundle_subscriber", defaultNaming.getServiceName(getParameter("Foo\\FooBar\\SearchBundleSubscriber")));
+    }
+
     private ServiceNameStrategyParameter getParameter(String className) {
         return new ServiceNameStrategyParameter(getProject(), className);
     }