Merge pull request #298 from NiR-/fix/default-config

Fix #267: if no config specified all behaviors are enabled
KnpLabs · Mar 9, 2016 · 29c1606 · 29c1606
2 parents dd4a575 + f7dc13e
commit 29c1606
Showing 1 changed file with 20 additions and 11 deletions.
diff --git a/src/Bundle/DependencyInjection/Configuration.php b/src/Bundle/DependencyInjection/Configuration.php
@@ -12,17 +12,26 @@ public function getConfigTreeBuilder()
         $builder = new TreeBuilder();
         $builder
             ->root('knp_doctrine_behaviors')
-            ->treatNullLike([
-                'blameable'      => true,
-                'geocodable'     => true,
-                'loggable'       => true,
-                'sluggable'      => true,
-                'soft_deletable' => true,
-                'sortable'       => true,
-                'timestampable'  => true,
-                'translatable'   => true,
-                'tree'           => true,
-            ])->children()
+            ->beforeNormalization()
+                ->always(function (array $config) use ($default) {
+                    if (empty($config)) {
+                        return [
+                            'blameable'      => true,
+                            'geocodable'     => true,
+                            'loggable'       => true,
+                            'sluggable'      => true,
+                            'soft_deletable' => true,
+                            'sortable'       => true,
+                            'timestampable'  => true,
+                            'translatable'   => true,
+                            'tree'           => true,
+                        ];
+                    }
+
+                    return $config;
+                })
+            ->end()
+            ->children()
                 ->booleanNode('blameable')->defaultFalse()->treatNullLike(false)->end()
                 ->booleanNode('geocodable')->defaultFalse()->treatNullLike(false)->end()
                 ->booleanNode('loggable')->defaultFalse()->treatNullLike(false)->end()