Merge pull request #130 from symfony-cmf/initialize_basepath

added initializer to ensure the base path exists
symfony-cmf · Aug 28, 2014 · 31a7eef · 31a7eef
2 parents d5cd9c0 + 8562860
commit 31a7eef
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -63,7 +63,7 @@ protected function getPersistenceNode()
                     ->addDefaultsIfNotSet()
                     ->canBeEnabled()
                     ->children()
-                        ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
+                        ->scalarNode('route_basepath')->defaultValue('/cms/routes')->cannotBeEmpty()->end()
                     ->end()
                 ->end() // phpcr
             ->end();

diff --git a/Resources/config/phpcr-odm.xml b/Resources/config/phpcr-odm.xml
@@ -22,5 +22,13 @@
             <tag name="doctrine_phpcr.event_listener" event="onFlush"/>
             <tag name="doctrine_phpcr.event_listener" event="endFlush"/>
         </service>
+
+        <service id="cmf_routing_auto.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">
+            <argument>CmfRoutingAutoBundle</argument>
+            <argument type="collection">
+                <argument>%cmf_routing_auto.persistence.phpcr.route_basepath%</argument>
+            </argument>
+            <tag name="doctrine_phpcr.initializer"/>
+        </service>
     </services>
 </container>
diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
     "require": {
         "symfony-cmf/routing-auto": "1.0.*",
         "symfony-cmf/routing-bundle": "~1.2",
-        "symfony-cmf/core-bundle": "~1.1",
+        "symfony-cmf/core-bundle": "~1.2",
         "aferrandini/urlizer": "1.0.*",
         "symfony/config": "~2.2",
         "jms/metadata": "1.5.*"