diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php index c1246dc97a..7d8c11613b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php +++ b/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(), )); } diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml index b0f87af328..9f86f70af7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml @@ -47,7 +47,7 @@ - + %router.resource% @@ -63,6 +63,7 @@ %router.options.matcher.cache_class% +