diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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
-------

a4d799ad0e [FrameworkBundle] Fix colliding service ids
This commit is contained in:
Fabien Potencier 2017-06-12 08:47:10 -07:00
commit d3d62e9fa2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -705,7 +705,7 @@ class FrameworkExtension extends Extension
->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 @@ class FrameworkExtension extends Extension
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(