From 85628601514a0fd5c318ef5cbb0aae19056bbd73 Mon Sep 17 00:00:00 2001
From: Lukas Kahwe Smith <smith@pooteeweet.org>
Date: Wed, 27 Aug 2014 09:27:00 +0200
Subject: [PATCH] added initializer to ensure the base path exists

---
 DependencyInjection/Configuration.php | 2 +-
 Resources/config/phpcr-odm.xml        | 8 ++++++++
 composer.json                         | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index 5c0bb2b..1488ae2 100644
--- 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
index b910643..d5862f1 100644
--- 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
index f9fa17d..95ad07d 100644
--- 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.*"