Changed enabling node

Author: wouterj

DependencyInjection/CmfRoutingExtension.php

@@ -25,7 +25,7 @@ public function load(array $configs, ContainerBuilder $container)
         $config = $this->processConfiguration(new Configuration(), $configs);
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
-        if (!empty($config['dynamic']['enabled'])) {
+        if ($config['dynamic']['enabled']) {
             // load this even if no explicit enabled value but some configuration
             $this->setupDynamicRouter($config['dynamic'], $container, $loader);
         }
@@ -88,13 +88,17 @@ private function setupDynamicRouter(array $config, ContainerBuilder $container,
 
         $hasProvider = false;
         $hasContentRepository = false;
-        if (!empty($config['persistence']['phpcr']['enabled'])) {
+        if ($config['persistence']['phpcr']['enabled'] && $config['persistence']['orm']['enabled']) {
+            throw new InvalidConfigurationException('You can only enable either phpcr or orm, not both.');
+        }
+
+        if ($config['persistence']['phpcr']['enabled']) {
             $this->loadPhpcrProvider($config['persistence']['phpcr'], $loader, $container, $locales);
             $hasProvider = true;
             $hasContentRepository = true;
         }
 
-        if (!empty($config['persistence']['orm']['enabled'])) {
+        if ($config['persistence']['orm']['enabled']) {
             $this->loadOrmProvider($config['persistence']['orm'], $loader, $container);
             $hasProvider = true;
         }

DependencyInjection/Configuration.php

@@ -43,8 +43,9 @@ public function getConfigTreeBuilder()
                     ->fixXmlConfig('template_by_class', 'templates_by_class')
                     ->fixXmlConfig('route_filter_by_id', 'route_filters_by_id')
                     ->fixXmlConfig('locale')
+                    ->addDefaultsIfNotSet()
                     ->children()
-                        ->scalarNode('enabled')->defaultNull()->end()
+                        ->booleanNode('enabled')->defaultFalse()->end()
                         ->scalarNode('generic_controller')->defaultNull()->end()
                         ->arrayNode('controllers_by_type')
                             ->useAttributeAsKey('type')
@@ -61,8 +62,9 @@ public function getConfigTreeBuilder()
                         ->arrayNode('persistence')
                             ->children()
                                 ->arrayNode('phpcr')
+                                    ->addDefaultsIfNotSet()
                                     ->children()
-                                        ->scalarNode('enabled')->defaultNull()->end()
+                                        ->booleanNode('enabled')->defaultFalse()->end()
                                         ->scalarNode('manager_name')->defaultNull()->end()
                                         ->scalarNode('route_basepath')->defaultValue('/cms/routes')->end()
                                         ->scalarNode('content_basepath')->defaultValue('/cms/content')->end()
@@ -73,8 +75,9 @@ public function getConfigTreeBuilder()
                                     ->end()
                                 ->end()
                                 ->arrayNode('orm')
+                                    ->addDefaultsIfNotSet()
                                     ->children()
-                                        ->scalarNode('enabled')->defaultNull()->end()
+                                        ->booleanNode('enabled')->defaultFalse()->end()
                                         ->scalarNode('manager_name')->defaultNull()->end()
                                     ->end()
                                 ->end()