Merge pull request #330 from alcaeus/validate-replicaset-string

Add validation to ensure replicaSet is a string
doctrine · Dec 25, 2015 · 991b3a2 · 991b3a2
2 parents 66b3019 + acc2ba5
commit 991b3a2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -232,7 +232,9 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode)
                                             ->prototype('scalar')->end()
                                         ->end()
                                     ->end()
-                                    ->scalarNode('replicaSet')->end()
+                                    ->scalarNode('replicaSet')
+                                        ->validate()->ifTrue(function ($v) { return !is_string($v); })->thenInvalid('The replicaSet option must be a string')->end()
+                                    ->end()
                                     ->scalarNode('socketTimeoutMS')->end()
                                     ->booleanNode('ssl')->end()
                                     ->scalarNode('username')

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -412,4 +412,26 @@ public function testPasswordAndUsernameShouldBeUnsetIfNull()
         $this->assertEquals(array('username' => 'foo'), $options['connections']['conn2']['options']);
         $this->assertEquals(array(), $options['connections']['conn3']['options']);
     }
+
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage The replicaSet option must be a string
+     */
+    public function testInvalidReplicaSetValue()
+    {
+        $config = array(
+            'connections' => array(
+                'conn1' => array(
+                    'server'  => 'mongodb://localhost',
+                    'options' => array(
+                        'replicaSet' => true
+                    )
+                )
+            )
+        );
+
+        $processor = new Processor();
+        $configuration = new Configuration(false);
+        $processor->processConfiguration($configuration, array($config));
+    }
 }