From fcb9e8f2f5d19ecfe83fdb87b296fd5dde3f67bd Mon Sep 17 00:00:00 2001
From: Chris Tickner <chris.tickner@gmail.com>
Date: Tue, 14 Aug 2012 18:44:25 -0300
Subject: [PATCH] Updated the DoctrineMongoDBBundle service IDs

The service IDs for the DoctrineMongoDBBundle have changed for version 2.1.  This is an update to reflect that change.

https://github.com/doctrine/DoctrineMongoDBBundle/pull/134
---
 Resources/config/mongodb.xml | 6 +++---
 composer.json                | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/config/mongodb.xml b/Resources/config/mongodb.xml
index 4a3e22b..6d46dff 100644
--- a/Resources/config/mongodb.xml
+++ b/Resources/config/mongodb.xml
@@ -10,7 +10,7 @@
             <argument /> <!-- object persister -->
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
-            <argument type="service" id="doctrine.odm.mongodb" />
+            <argument type="service" id="doctrine_mongodb" />
         </service>
 
         <service id="foq_elastica.listener.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\Listener" public="false" abstract="true">
@@ -21,13 +21,13 @@
         </service>
 
         <service id="foq_elastica.elastica_to_model_transformer.prototype.mongodb" class="FOQ\ElasticaBundle\Doctrine\MongoDB\ElasticaToModelTransformer" public="false">
-            <argument type="service" id="doctrine.odm.mongodb" />
+            <argument type="service" id="doctrine_mongodb" />
             <argument /> <!-- model -->
             <argument type="collection" /> <!-- options -->
         </service>
 
         <service id="foq_elastica.manager.mongodb" class="FOQ\ElasticaBundle\Doctrine\RepositoryManager">
-            <argument type="service" id="doctrine.odm.mongodb"/>
+            <argument type="service" id="doctrine_mongodb"/>
             <argument type="service" id="annotation_reader"/>
         </service>
 
diff --git a/composer.json b/composer.json
index e4b4b31..350c4a0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
     },
     "suggest": {
         "doctrine/orm": "2.2.*",
-        "doctrine/mongodb-odm": "dev-master",
+        "doctrine/mongodb-odm": ">=3.0.0-beta2,<3.1-dev",
         "propel/propel1": "1.6.*"
     },
     "autoload": {