Merge branch 'annotation-driver-fix' into 3.0

alcaeus · alcaeus · commit bab5072b6dfc · 2015-12-20T09:11:28.000+01:00
* annotation-driver-fix:
  Fix annotation driver mapping pass to correctly instantiate and pass the annotation driver.
diff --git 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('annotation_reader'), $directories));
 
         return new DoctrineMongoDBMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);
     }

Original file line number	Diff line number	Diff line change
`@@ -128,9 +128,7 @@ public static function createPhpMappingDriver(array $mappings, array $managerPar`
`128`	`128`	`*/`
`129`	`129`	`public static function createAnnotationMappingDriver(array $namespaces, array $directories, array $managerParameters, $enabledParameter = false, array $aliasMap = array())`
`130`	`130`	`{`
`131`		`- $arguments = array(new Reference('doctrine_mongodb.odm.metadata.annotation_reader'), $directories);`
`132`		`- $locator = new Definition('Doctrine\Common\Persistence\Mapping\Driver\SymfonyFileLocator', $arguments);`
`133`		`- $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array($locator));`
	`131`	`+ $driver = new Definition('Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver', array(new Reference('annotation_reader'), $directories));`
`134`	`132`
`135`	`133`	`return new DoctrineMongoDBMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);`
`136`	`134`	`}`