Made PHPCR initializer independent from Sonata-related setting, creating all defined route_basepaths

Author: pamil

DependencyInjection/CmfRoutingExtension.php

@@ -281,6 +281,10 @@ public function loadPhpcrProvider($config, XmlFileLoader $loader, ContainerBuild
         if ($config['use_sonata_admin']) {
             $this->loadSonataPhpcrAdmin($config, $loader, $container);
         }
+
+        if ($config['enable_initializer']) {
+            $loader->load('initializer-phpcr.xml');
+        }
     }
 
     public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBuilder $container)
@@ -294,10 +298,6 @@ public function loadSonataPhpcrAdmin($config, XmlFileLoader $loader, ContainerBu
         $container->setParameter($this->getAlias() . '.dynamic.persistence.phpcr.admin_basepath', $basePath);
 
         $loader->load('admin-phpcr.xml');
-
-        if ($config['enable_initializer']) {
-            $loader->load('initializer-phpcr.xml');
-        }
     }
 
     public function loadOrmProvider($config, XmlFileLoader $loader, ContainerBuilder $container, $matchImplicitLocale)

Resources/config/initializer-phpcr.xml

@@ -8,9 +8,7 @@
 
         <service id="cmf_routing.initializer" class="Doctrine\Bundle\PHPCRBundle\Initializer\GenericInitializer">
             <argument>CmfRoutingBundle</argument>
-            <argument type="collection">
-                <argument>%cmf_routing.dynamic.persistence.phpcr.admin_basepath%</argument>
-            </argument>
+            <argument>%cmf_routing.dynamic.persistence.phpcr.route_basepaths%</argument>
             <tag name="doctrine_phpcr.initializer"/>
         </service>
 

Tests/Unit/DependencyInjection/CmfRoutingExtensionTest.php

@@ -300,7 +300,6 @@ public function testInitializerDisabled()
             'kernel.bundles',
             array(
                 'CmfRoutingBundle' => true,
-                'SonataDoctrinePHPCRAdminBundle' => true,
             )
         );
 
@@ -310,7 +309,6 @@ public function testInitializerDisabled()
                 'persistence' => array(
                     'phpcr' => array(
                         'enabled' => true,
-                        'use_sonata_admin' => true,
                         'enable_initializer' => false,
                     ),
                 ),
@@ -320,7 +318,7 @@ public function testInitializerDisabled()
         $this->assertFalse($this->container->has('cmf_routing.initializer'));
     }
 
-    public function testInitializerDisabledWithoutSonata()
+    public function testInitializerEnabledEvenWithoutSonata()
     {
         $this->load(array(
                 'dynamic' => array(
@@ -329,11 +327,12 @@ public function testInitializerDisabledWithoutSonata()
                         'phpcr' => array(
                             'enabled' => true,
                             'use_sonata_admin' => false,
+                            'enable_initializer' => true,
                         ),
                     ),
                 ),
             ));
 
-        $this->assertFalse($this->container->has('cmf_routing.initializer'));
+        $this->assertTrue($this->container->has('cmf_routing.initializer'));
     }
 }