default persistence.phpcr.enabled to false

lsmith77 · lsmith77 · commit f262f615c570 · 2013-09-04T13:19:07.000+02:00
diff --git a/DependencyInjection/CmfMenuExtension.php b/DependencyInjection/CmfMenuExtension.php
@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container)
 
         $this->loadVoters($config, $loader, $container);
 
-        if (!empty($config['persistence']['phpcr']['enabled'])) {
+        if ($config['persistence']['phpcr']['enabled']) {
             $this->loadPhpcr($config['persistence']['phpcr'], $loader, $container);
         }
     }
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -15,8 +15,10 @@ public function getConfigTreeBuilder()
             ->fixXmlConfig('voter')
             ->children()
                 ->arrayNode('persistence')
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->arrayNode('phpcr')
+                            ->addDefaultsIfNotSet()
                             ->children()
                                 ->scalarNode('enabled')->defaultNull()->end()
                                 ->scalarNode('menu_basepath')->defaultValue('/cms/menu')->end()

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function load(array $configs, ContainerBuilder $container)`
`27`	`27`
`28`	`28`	`$this->loadVoters($config, $loader, $container);`
`29`	`29`
`30`		`- if (!empty($config['persistence']['phpcr']['enabled'])) {`
	`30`	`+ if ($config['persistence']['phpcr']['enabled']) {`
`31`	`31`	`$this->loadPhpcr($config['persistence']['phpcr'], $loader, $container);`
`32`	`32`	`}`
`33`	`33`	`}`