From a4d799ad0ede712c8ce6cd2f549700e29183f047 Mon Sep 17 00:00:00 2001 From: Guilhem Niot Date: Sun, 11 Jun 2017 11:30:54 +0200 Subject: [PATCH] [FrameworkBundle] Fix colliding service ids --- .../DependencyInjection/FrameworkExtension.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index eb6ee7aeace87..3cdeb6afcb0b1 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php @@ -705,7 +705,7 @@ 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( @@ -713,7 +713,7 @@ private function registerRouterConfiguration(array $config, ContainerBuilder $co 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(