fixed basepath parameter names

Author: lsmith77

DependencyInjection/CmfRoutingExtension.php

@@ -98,7 +98,7 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
             $hasProvider = true;
         }
         if (!$hasProvider) {
-            throw new InvalidConfigurationException('When the dynamic router is enabled, you need to either set dynamic.phpcr_provider.enabled or specify dynamic.route_provider_service_id');
+            throw new InvalidConfigurationException('When the dynamic router is enabled, you need to either set dynamic.persistence.phpcr.enabled or specify dynamic.route_provider_service_id');
         }
         if (isset($config['content_repository_service_id'])) {
             $container->setAlias('cmf_routing.content_repository', $config['content_repository_service_id']);
@@ -142,8 +142,8 @@ public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuild
 
         $container->setParameter($this->getAlias() . '.backend_type_phpcr', true);
 
-        $container->setParameter($this->getAlias() . '.phpcr_provider.route_basepath', $config['route_basepath']);
-        $container->setParameter($this->getAlias() . '.phpcr_provider.content_basepath', $config['content_basepath']);
+        $container->setParameter($this->getAlias() . '.persistence.phpcr.route_basepath', $config['route_basepath']);
+        $container->setParameter($this->getAlias() . '.persistence.phpcr.content_basepath', $config['content_basepath']);
 
         $container->setParameter($this->getAlias() . '.manager_name', $config['manager_name']);
 

Resources/config/admin_phpcr.xml

@@ -24,11 +24,11 @@
             </call>
 
             <call method="setContentRoot">
-                <argument>%cmf_routing.phpcr_provider.content_basepath%</argument>
+                <argument>%cmf_routing.persistence.phpcr.content_basepath%</argument>
             </call>
 
             <call method="setRouteRoot">
-                <argument>%cmf_routing.phpcr_provider.route_basepath%</argument>
+                <argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
             </call>
             <call method="setControllerResolver">
                 <argument type="service" id="controller_resolver" />
@@ -46,7 +46,7 @@
             </call>
 
             <call method="setRouteRoot">
-                <argument>%cmf_routing.phpcr_provider.route_basepath%</argument>
+                <argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
             </call>
         </service>
 

Resources/config/provider_phpcr.xml

@@ -16,7 +16,7 @@
             <argument type="service" id="doctrine_phpcr"/>
             <argument>%cmf_routing.route_model_class%</argument>
             <call method="setManagerName"><argument>%cmf_routing.manager_name%</argument></call>
-            <call method="setPrefix"><argument>%cmf_routing.phpcr_provider.route_basepath%</argument></call>
+            <call method="setPrefix"><argument>%cmf_routing.persistence.phpcr.route_basepath%</argument></call>
         </service>
 
         <service id="cmf_routing.phpcr_content_repository" class="%cmf_routing.content_repository_class%">
@@ -25,13 +25,13 @@
         </service>
 
         <service id="cmf_routing.phpcrodm_route_idprefix_listener" class="%cmf_routing.phpcrodm_route_idprefix_listener_class%">
-            <argument>%cmf_routing.phpcr_provider.route_basepath%</argument>
+            <argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
             <tag name="doctrine_phpcr.event_listener" event="postLoad" />
             <tag name="doctrine_phpcr.event_listener" event="postPersist" />
         </service>
 
         <service id="cmf_routing.phpcrodm_route_locale_listener" class="%cmf_routing.phpcrodm_route_locale_listener_class%">
-            <argument>%cmf_routing.phpcr_provider.route_basepath%</argument>
+            <argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
             <argument>%cmf_routing.locales%</argument>
             <tag name="doctrine_phpcr.event_listener" event="postLoad" />
             <tag name="doctrine_phpcr.event_listener" event="postPersist" />
@@ -40,7 +40,7 @@
 
         <service id="cmf_routing.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">
             <argument type="collection">
-                <argument>%cmf_routing.phpcr_provider.route_basepath%</argument>
+                <argument>%cmf_routing.persistence.phpcr.route_basepath%</argument>
             </argument>
             <tag name="doctrine_phpcr.initializer"/>
         </service>