handle BlockBundle, aligned manager_name config option

Author: lsmith77

DependencyInjection/CmfCoreExtension.php

@@ -52,30 +52,34 @@ public function prepend(ContainerBuilder $container)
                 $prependConfig = array();
 
                 switch ($name) {
-/*
                     case 'cmf_block':
                         $prependConfig = array(
-                            'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
-                            'content_basepath' => $persistenceConfig['basepath'].'/content',
-                            'block_basepath' => $persistenceConfig['basepath'].'/content',
-                            'manager_name' => $persistenceConfig['manager_name'],
+                            'persistence' => array(
+                                'phpcr' => array(
+                                    'enabled' => $persistenceConfig['enabled'],
+                                    'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
+                                    'content_basepath' => $persistenceConfig['basepath'].'/content',
+                                    'block_basepath' => $persistenceConfig['basepath'].'/content',
+                                    'manager_name' => $persistenceConfig['manager_name'],
+                                )
+                            )
                         );
                         break;
+                    /*
                     case 'cmf_blog':
                         $prependConfig = array(
                             'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
                             'blog_basepath' => $persistenceConfig['basepath'].'/content',
                         );
                         break;
-*/
+                    */
                     case 'cmf_content':
                         $prependConfig = array(
                             'persistence' => array(
                                 'phpcr' => array(
                                     'enabled' => $persistenceConfig['enabled'],
                                     'use_sonata_admin' => $persistenceConfig['use_sonata_admin'],
                                     'content_basepath' => $persistenceConfig['basepath'].'/content',
-                                    // the ContentBundle does not use the manager directly
                                 )
                             )
                         );

Resources/config/services.xml

@@ -5,7 +5,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <parameters>
-        <parameter key="cmf_core.manager_name">null</parameter>
+        <parameter key="cmf_core.persistence.phpcr.manager_name">null</parameter>
         <parameter key="cmf_core.twig_extension.class">Symfony\Cmf\Bundle\CoreBundle\Twig\Extension\CmfExtension</parameter>
         <parameter key="cmf_core.templating.helper.class">Symfony\Cmf\Bundle\CoreBundle\Templating\Helper\CmfHelper</parameter>
         <parameter key="cmf_core.listener.request_aware.class">Symfony\Cmf\Bundle\CoreBundle\EventListener\RequestAwareListener</parameter>
@@ -21,7 +21,7 @@
         <service id="cmf_core.templating.helper" class="%cmf_core.templating.helper.class%">
             <argument type="service" id="cmf_core.publish_workflow.checker" on-invalid="ignore"/>
             <argument type="service" id="doctrine_phpcr" on-invalid="ignore"/>
-            <argument>%cmf_core.manager_name%</argument>
+            <argument>%cmf_core.persistence.phpcr.manager_name%</argument>
         </service>
 
         <service id="cmf_core.listener.request_aware" class="%cmf_core.listener.request_aware.class%">