diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
index 53c2d1f81f9d..5ae0e77d7f27 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/DoctrineMongoDBExtension.php
@@ -208,14 +208,6 @@ protected function getDocumentManagers(array $config, ContainerBuilder $containe
if (count($config['document_managers'])) {
$configDocumentManagers = $config['document_managers'];
- if (isset($config['document_managers']['document-manager'])) {
- $config['document_managers']['document_manager'] = $config['document_managers']['document-manager'];
- }
-
- if (isset($config['document_managers']['document_manager']) && isset($config['document_managers']['document_manager'][0])) {
- // Multiple document managers
- $configDocumentManagers = $config['document_managers']['document_manager'];
- }
foreach ($configDocumentManagers as $name => $documentManager) {
$documentManagers[isset($documentManager['id']) ? $documentManager['id'] : $name] = $documentManager;
}
@@ -287,10 +279,6 @@ protected function getConnections(array $config, ContainerBuilder $container)
$connections = array();
if (count($config['connections'])) {
$configConnections = $config['connections'];
- if (isset($config['connections']['connection']) && isset($config['connections']['connection'][0])) {
- // Multiple connections
- $configConnections = $config['connections']['connection'];
- }
foreach ($configConnections as $name => $connection) {
$connections[isset($connection['id']) ? $connection['id'] : $name] = $connection;
}
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml
index 6b98c8d33ade..3bbb647db2a8 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_multiple_connections.xml
@@ -13,21 +13,18 @@
proxy-namespace="Proxies"
auto-generate-proxy-classes="true"
>
-
-
-
- true
-
-
-
-
- true
-
-
-
-
-
-
-
+
+
+ true
+
+
+
+
+ true
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml
index b5f50a7983a1..45e5515f8a32 100644
--- a/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml
+++ b/src/Symfony/Bundle/DoctrineMongoDBBundle/Tests/DependencyInjection/Fixtures/config/xml/mongodb_service_single_connection.xml
@@ -7,22 +7,21 @@
http://symfony.com/schema/dic/doctrine/odm/mongodb http://symfony.com/schema/dic/doctrine/odm/mongodb/mongodb-1.0.xsd">
-
-
-
- true
-
-
-
-
-
-
- Doctrine\Common\Cache\MemcacheCache
- localhost
- 11211
- Memcache
-
-
-
+
+
+
+ true
+
+
+
+
+
+ Doctrine\Common\Cache\MemcacheCache
+ localhost
+ 11211
+ Memcache
+
+
+
\ No newline at end of file