Merge pull request #293 from wearemarketing/master

ORM content repository implementation ready

Author: dbu

DependencyInjection/CmfRoutingExtension.php

@@ -118,6 +118,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
         if ($config['persistence']['orm']['enabled']) {
             $this->loadOrmProvider($config['persistence']['orm'], $loader, $container, $locales, $config['match_implicit_locale']);
             $hasProvider = true;
+            $hasContentRepository = true;
         }
 
         if (isset($config['route_provider_service_id'])) {
@@ -306,6 +307,10 @@ public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder
             $definition = $container->getDefinition($this->getAlias() . '.orm_candidates');
             $definition->setArguments(array());
         }
+        $container->setAlias(
+            $this->getAlias() . '.content_repository',
+            $this->getAlias() . '.orm_content_repository'
+        );
     }
 
     /**

Resources/config/provider-orm.xml

@@ -12,7 +12,7 @@
 
     <services>
 
-        <service id="cmf_routing.content_repository" class="%cmf_routing.orm.content_repository.class%">
+        <service id="cmf_routing.orm_content_repository" class="%cmf_routing.orm.content_repository.class%">
             <argument type="service" id="doctrine"/>
             <call method="setManagerName"><argument>%cmf_routing.dynamic.persistence.orm.manager_name%</argument></call>
         </service>