Merge pull request #295 from symfony-cmf/custom_generator

Allow specification of custom URL generator

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -225,6 +225,8 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
                 $matcher->addMethodCall('addRouteFilter', array(new Reference($id), $priority));
             }
         }
+
+        $dynamic->replaceArgument(2, new Reference($config['url_generator']));
     }
 
     public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuilder $container, $locales, $matchImplicitLocale)

DependencyInjection/Configuration.php

@@ -134,6 +134,10 @@ public function getConfigTreeBuilder()
                         ->integerNode('limit_candidates')->defaultValue(20)->end()
                         ->booleanNode('match_implicit_locale')->defaultValue(true)->end()
                         ->booleanNode('auto_locale_pattern')->defaultValue(false)->end()
+                        ->scalarNode('url_generator')
+                            ->defaultValue('cmf_routing.generator')
+                            ->info('URL generator service ID')
+                        ->end()
                     ->end()
                 ->end()
             ->end()

Resources/config/routing-dynamic.xml

@@ -64,7 +64,7 @@
         <service id="cmf_routing.dynamic_router" class="%cmf_routing.dynamic_router.class%">
             <argument type="service" id="router.request_context"/>
             <argument type="service" id="cmf_routing.nested_matcher" />
-            <argument type="service" id="cmf_routing.generator" />
+            <argument/>
             <argument>%cmf_routing.uri_filter_regexp%</argument>
             <argument type="service" id="event_dispatcher" on-invalid="ignore"/>
             <argument type="service" id="cmf_routing.route_provider"/>

Tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php

@@ -234,5 +234,4 @@ public function testInitializerDisabledWithoutSonata()
 
         $this->assertFalse($this->container->has('cmf_routing.initializer'));
     }
-
 }

Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -74,6 +74,7 @@ public function testSupportsAllConfigFormats()
                 'limit_candidates' => 20,
                 'auto_locale_pattern' => true,
                 'match_implicit_locale' => true,
+                'url_generator' => 'cmf_routing.generator',
             ),
         );