fix configuration if not using phpcr provider. fix #124

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -87,11 +87,12 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         $loader->load('dynamic_routing.xml');
 
         $hasProvider = false;
+        $hasContentRepository = false;
         if (!empty($config['phpcr_provider']['enabled'])) {
             $this->loadPhpcrProvider($config['phpcr_provider'], $loader, $container);
             $hasProvider = true;
+            $hasContentRepository = true;
         }
-
         if (isset($config['route_provider_service_id'])) {
             $container->setAlias('cmf_routing.route_provider', $config['route_provider_service_id']);
             $hasProvider = true;
@@ -101,6 +102,14 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         }
         if (isset($config['content_repository_service_id'])) {
             $container->setAlias('cmf_routing.content_repository', $config['content_repository_service_id']);
+            $hasContentRepository = true;
+        }
+        // content repository is optional
+        if ($hasContentRepository) {
+            $generator = $container->getDefinition($this->getAlias() . '.generator');
+            $generator->addMethodCall('setContentRepository', array(
+                new Reference($this->getAlias() . '.content_repository'),
+            ));
         }
 
         $dynamic = $container->getDefinition($this->getAlias().'.dynamic_router');

Resources/config/dynamic_routing.xml

@@ -76,7 +76,6 @@
             <argument type="service" id="cmf_routing.route_provider" />
             <argument type="service" id="logger" on-invalid="ignore" />
             <call method="setContainer"><argument type="service" id="service_container"/></call>
-            <call method="setContentRepository"><argument type="service" id="cmf_routing.content_repository"/></call>
         </service>
 
         <service id="cmf_routing.redirect_controller" class="%cmf_routing.redirect_controller_class%">