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

fix non-extensible router

Browse Source
This commit is contained in:
Johannes Schmitt 2011-07-18 10:05:28 +02:00
parent f18e3fc333
commit fc4787ac90
2 changed files with 4 additions and 3 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

@ -235,7 +235,7 @@ class FrameworkExtension extends Extension
$loader->load('routing.xml'); $loader->load('routing.xml');
$container->setParameter('router.resource', $config['resource']); $container->setParameter('router.resource', $config['resource']);
$router = $container->findDefinition('router'); $router = $container->findDefinition('router.default');
if (isset($config['type'])) { if (isset($config['type'])) {
$argument = $router->getArgument(2); $argument = $router->getArgument(2);
@ -252,7 +252,7 @@ class FrameworkExtension extends Extension
'Symfony\\Component\\Routing\\Matcher\\UrlMatcher', 'Symfony\\Component\\Routing\\Matcher\\UrlMatcher',
'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface', 'Symfony\\Component\\Routing\\Generator\\UrlGeneratorInterface',
'Symfony\\Component\\Routing\\Generator\\UrlGenerator', 'Symfony\\Component\\Routing\\Generator\\UrlGenerator',
$container->findDefinition('router')->getClass(), $container->findDefinition('router.default')->getClass(),
)); ));
} }

3
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml
View File

@ -47,7 +47,7 @@
<argument type="service" id="routing.resolver" /> <argument type="service" id="routing.resolver" />
</service> </service>
<service id="router" class="%router.class%"> <service id="router.default" class="%router.class%" public="false">
<argument type="service" id="service_container" /> <argument type="service" id="service_container" />
<argument>%router.resource%</argument> <argument>%router.resource%</argument>
<argument type="collection"> <argument type="collection">
@ -63,6 +63,7 @@
<argument key="matcher_cache_class">%router.options.matcher.cache_class%</argument> <argument key="matcher_cache_class">%router.options.matcher.cache_class%</argument>
</argument> </argument>
</service> </service>
<service id="router" alias="router.default" />
<service id="router.cache_warmer" class="%router.cache_warmer.class%" public="false"> <service id="router.cache_warmer" class="%router.cache_warmer.class%" public="false">
<tag name="kernel.cache_warmer" /> <tag name="kernel.cache_warmer" />