bug #23132 [FrameworkBundle] Fix colliding service ids (GuilhemN)

fabpot · fabpot · commit d3d62e9fa2fc · 2017-06-12T08:47:10.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- [FrameworkBundle] Fix colliding service ids | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Rereading #23044, I realized that `routing.loader.directory` is already used, so it should be changed. Commits ------- a4d799a [FrameworkBundle] Fix colliding service ids
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -705,15 +705,15 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co
                 ->addTag('routing.loader', array('priority' => -10))
                 ->addArgument(new Reference('annotation_reader'));
 
-            $container->register('routing.loader.directory', AnnotationDirectoryLoader::class)
+            $container->register('routing.loader.annotation.directory', AnnotationDirectoryLoader::class)
                 ->setPublic(false)
                 ->addTag('routing.loader', array('priority' => -10))
                 ->setArguments(array(
                     new Reference('file_locator'),
                     new Reference('routing.loader.annotation'),
                 ));
 
-            $container->register('routing.loader.file', AnnotationFileLoader::class)
+            $container->register('routing.loader.annotation.file', AnnotationFileLoader::class)
                 ->setPublic(false)
                 ->addTag('routing.loader', array('priority' => -10))
                 ->setArguments(array(
