default persistence.phpcr.enabled to false, added CmfSearchBundle and CmfTreeBrowserBundle prepend support

Author: lsmith77

DependencyInjection/CmfCoreExtension.php

@@ -37,7 +37,7 @@ public function prepend(ContainerBuilder $container)
             }
         }
 
-        if (isset($config['persistence']['phpcr'])) {
+        if ($config['persistence']['phpcr']) {
             $bundles = $container->getParameter('kernel.bundles');
             $persistenceConfig = $config['persistence']['phpcr'];
 
@@ -124,6 +124,17 @@ public function prepend(ContainerBuilder $container)
                             $prependConfig['dynamic']['generic_controller'] = 'cmf_content.controller:indexAction';
                         }
                         break;
+                    case 'cmf_search':
+                        $prependConfig = array(
+                            'persistence' => array(
+                                'phpcr' => array(
+                                    'enabled' => $persistenceConfig['enabled'],
+                                    'search_basepath' => $persistenceConfig['basepath'].'/content',
+                                    'manager_name' => $persistenceConfig['manager_name'],
+                                )
+                            )
+                        );
+                        break;
                     case 'cmf_simple_cms':
                         $prependConfig = array(
                             'persistence' => array(
@@ -136,6 +147,15 @@ public function prepend(ContainerBuilder $container)
                             )
                         );
                         break;
+                    case 'cmf_tree_browser':
+                        $prependConfig = array(
+                            'persistence' => array(
+                                'phpcr' => array(
+                                    'enabled' => $persistenceConfig['enabled'],
+                                )
+                            )
+                        );
+                        break;
                 }
 
                 if ($prependConfig) {
@@ -155,7 +175,7 @@ public function load(array $configs, ContainerBuilder $container)
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
         $loader->load('services.xml');
 
-        if (!empty($config['persistence']['phpcr']['enabled'])) {
+        if ($config['persistence']['phpcr']['enabled']) {
             $container->setParameter($this->getAlias() . '.persistence.phpcr.manager_name', $config['persistence']['phpcr']['manager_name']);
             $container->setParameter($this->getAlias() . '.persistence.phpcr.basepath', $config['persistence']['phpcr']['basepath']);
         }

DependencyInjection/Configuration.php

@@ -18,10 +18,12 @@ public function getConfigTreeBuilder()
         $rootNode
             ->children()
                 ->arrayNode('persistence')
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->arrayNode('phpcr')
+                            ->addDefaultsIfNotSet()
                             ->children()
-                                ->scalarNode('enabled')->defaultNull()->end()
+                                ->booleanNode('enabled')->defaultFalse()->end()
                                 ->scalarNode('basepath')->defaultValue('/cms')->end()
                                 ->scalarNode('manager_name')->defaultNull()->end()
                                 ->enumNode('use_sonata_admin')