Merge pull request #223 from doctrine/fix/gh222

Restore addDefaultsIfNotSet() for "default_commit_options"
doctrine · Feb 4, 2014 · b9a52dc · b9a52dc
2 parents 80c9f4d + 8e2e4a5
commit b9a52dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -50,6 +50,7 @@ public function getConfigTreeBuilder()
                 ->scalarNode('default_connection')->end()
                 ->scalarNode('default_database')->defaultValue('default')->end()
                 ->arrayNode('default_commit_options')
+                    ->addDefaultsIfNotSet()
                     ->children()
                         ->booleanNode('j')->end()
                         ->scalarNode('timeout')->end()

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -38,6 +38,7 @@ public function testDefaults()
             'proxy_namespace'                => 'MongoDBODMProxies',
             'hydrator_dir'                   => '%kernel.cache_dir%/doctrine/odm/mongodb/Hydrators',
             'hydrator_namespace'             => 'Hydrators',
+            'default_commit_options'         => array(),
         );
 
         $this->assertEquals($defaults, $options);