Permalink
Browse files

Merge branch '2.0'

  • Loading branch information...
2 parents 564e0b1 + c7562cd commit 3645509770d4cdcf073341729fb8dc07b67e09e6 @jmikola jmikola committed Sep 11, 2012
@@ -181,6 +181,7 @@ private function addConnectionsSection(ArrayNodeDefinition $rootNode)
->booleanNode('slaveOkay')->end()
->scalarNode('username')->end()
->scalarNode('password')->end()
+ ->scalarNode('db')->end()
->end()
->end()
->end()
@@ -84,7 +84,7 @@ public function testFullConfiguration($config)
'default_connection' => 'conn1',
'connections' => array(
'conn1' => array(
- 'server' => 'http://server',
+ 'server' => 'mongodb://localhost',
'options' => array(
'connect' => true,
'persist' => 'persist_val',
@@ -93,10 +93,11 @@ public function testFullConfiguration($config)
'slaveOkay' => true,
'username' => 'username_val',
'password' => 'password_val',
+ 'db' => 'database_val',
),
),
'conn2' => array(
- 'server' => 'http://server2',
+ 'server' => 'mongodb://otherhost',
'options' => array(),
),
),
@@ -16,7 +16,7 @@ doctrine_mongodb:
connections:
conn1:
- server: http://server
+ server: mongodb://localhost
options:
connect: true
persist: persist_val
@@ -25,8 +25,9 @@ doctrine_mongodb:
slaveOkay: true
username: username_val
password: password_val
+ db: database_val
conn2:
- server: http://server2
+ server: mongodb://otherhost
document_managers:
dm1:

0 comments on commit 3645509

Please sign in to comment.