Merge pull request #223 from doctrine/fix/gh222

Restore addDefaultsIfNotSet() for "default_commit_options"

Author: jmikola

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()

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);