From 421b6577f5dca83f7332d35d593674cec5497bdc Mon Sep 17 00:00:00 2001
From: Shane Archer <shane@firebrandtech.com>
Date: Tue, 17 Mar 2015 13:52:01 -0700
Subject: [PATCH 1/2] Fix annotation driver mapping pass to correctly
 instantiate and pass the annotation driver.

---
 DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php b/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
index 4019e2b5..52508075 100644
--- a/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
+++ b/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
@@ -128,9 +128,7 @@ public static function createPhpMappingDriver(array $mappings, array $managerPar
      */
     public static function createAnnotationMappingDriver(array $namespaces, array $directories, array $managerParameters, $enabledParameter = false, array $aliasMap = array())
     {
-        $arguments = array(new Reference('doctrine_mongodb.odm.metadata.annotation_reader'), $directories);
-        $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);
-        $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array($locator));
+        $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array(new Reference('doctrine_mongodb.odm.metadata.annotation_reader'), $directories));
 
         return new DoctrineMongoDBMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }

From 6ff03b20948fa5338b7b31aedad2b500a113c8f5 Mon Sep 17 00:00:00 2001
From: Shane Archer <shane@firebrandtech.com>
Date: Wed, 15 Apr 2015 10:41:12 -0700
Subject: [PATCH 2/2] Replace old service alias with annotation_reader.

---
 DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php b/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
index 52508075..3daddb37 100644
--- a/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
+++ b/DependencyInjection/Compiler/DoctrineMongoDBMappingsPass.php
@@ -128,7 +128,7 @@ public static function createPhpMappingDriver(array $mappings, array $managerPar
      */
     public static function createAnnotationMappingDriver(array $namespaces, array $directories, array $managerParameters, $enabledParameter = false, array $aliasMap = array())
     {
-        $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array(new Reference('doctrine_mongodb.odm.metadata.annotation_reader'), $directories));
+        $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array(new Reference('annotation_reader'), $directories));
 
         return new DoctrineMongoDBMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }