Ver Fonte

fix non-extensible router

Johannes Schmitt há 14 anos atrás
pai
commit
fc4787ac90

+ 2 - 2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

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

+ 2 - 1
src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml

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