Merge pull request #324 from boekkooi/issue-283

Replace doctrine.orm.metadata.annotation_reader with annotation_reader.
doctrine · Aug 26, 2014 · f4672bf · f4672bf
2 parents a57fe0f + bfbd6ca
commit f4672bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -131,7 +131,7 @@ public static function createPhpMappingDriver(array $namespaces, array $managerP
      */
     public static function createAnnotationMappingDriver(array $namespaces, array $directories, array $managerParameters = array(), $enabledParameter = false, array $aliasMap = array())
     {
-        $reader = new Reference('doctrine.orm.metadata.annotation_reader');
+        $reader = new Reference('annotation_reader');
         $driver = new Definition('Doctrine\ORM\Mapping\Driver\AnnotationDriver', array($reader, $directories));
 
         return new DoctrineOrmMappingsPass($driver, $namespaces, $managerParameters, $enabledParameter, $aliasMap);

diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
@@ -71,7 +71,7 @@
     </parameters>
 
     <services>
-        <!--- Annotation Metadata Reader Service -->
+        <!--- Deprecated Annotation Metadata Reader Service alias, use annotation_reader service -->
         <service id="doctrine.orm.metadata.annotation_reader" alias="annotation_reader" public="false" />
 
         <service id="doctrine.orm.proxy_cache_warmer" class="%doctrine.orm.proxy_cache_warmer.class%" public="false">