Used router.resource variable

stof · Nov 16, 2011 · d70dfcf · d70dfcf
1 parent b6e5547
commit d70dfcf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/DependencyInjection/BeSimpleI18nRoutingExtension.php b/DependencyInjection/BeSimpleI18nRoutingExtension.php
@@ -26,7 +26,7 @@ public function load(array $configs, ContainerBuilder $container)
             'BeSimple\\I18nRoutingBundle\\Routing\\Generator\\UrlGenerator',
             'BeSimple\\I18nRoutingBundle\\Routing\\Router',
         ));
-        
+
         foreach ($configs as $config) {
             if (isset($config['connection'])) {
                 if (!isset($config['cache'])) {
@@ -64,10 +64,11 @@ public function load(array $configs, ContainerBuilder $container)
 
     /**
      * This is almost copied completly from DoctrineExtension::getEntityManagerCacheDefinition().
-     * 
+     *
      * @param type $cacheDriver
      * @param ContainerBuilder $container
-     * @return Definition 
+     *
+     * @return Definition
      */
     protected function getCacheDefinition($cacheDriver, ContainerBuilder $container)
     {

diff --git a/DependencyInjection/Compiler/OverrideRoutingCompilerPass.php b/DependencyInjection/Compiler/OverrideRoutingCompilerPass.php
@@ -12,13 +12,6 @@ public function process(ContainerBuilder $container)
         $container->setParameter('routing.loader.xml.class', 'BeSimple\\I18nRoutingBundle\\Routing\\Loader\\XmlFileLoader');
         $container->setParameter('routing.loader.yml.class', 'BeSimple\\I18nRoutingBundle\\Routing\\Loader\\YamlFileLoader');
 
-        $routerReal = $container->findDefinition('router');
-        $arguments  = $routerReal->getArguments();
-
         $container->setAlias('router', 'i18n_routing.router');
-
-
-        $i18nRoutingRouter = $container->findDefinition('i18n_routing.router');
-        $i18nRoutingRouter->replaceArgument(3, $arguments[1]);
     }
 }
diff --git a/Resources/config/routing.xml b/Resources/config/routing.xml
@@ -16,7 +16,7 @@
         <service id="i18n_routing.router" class="%i18n_routing.router.class%">
             <argument type="service" id="i18n_routing.translator" on-invalid="ignore" />
             <argument type="service" id="service_container" />
-            <argument /> <!-- routing resource -->
+            <argument>%router.resource%</argument>
             <argument type="collection">
                 <argument key="cache_dir">%kernel.cache_dir%</argument>
                 <argument key="debug">%kernel.debug%</argument>