From bfbd6ca8fd796a83c6a3fe160e2b379c3c52a4d7 Mon Sep 17 00:00:00 2001
From: Warnar Boekkooi <warnar@cerbex.com>
Date: Tue, 26 Aug 2014 10:29:19 +0800
Subject: [PATCH] Replace doctrine.orm.metadata.annotation_reader with
 annotation_reader. This fixes the problem of
 doctrine.orm.metadata.annotation_reader being removed by 
 Symfony\Component\DependencyInjection\Compiler\RemovePrivateAliasesPass.

---
 DependencyInjection/Compiler/DoctrineOrmMappingsPass.php | 2 +-
 Resources/config/orm.xml                                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
index 0a086fa81..7c1205700 100644
--- a/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
+++ b/DependencyInjection/Compiler/DoctrineOrmMappingsPass.php
@@ -119,7 +119,7 @@ public static function createPhpMappingDriver(array $mappings, array $managerPar
      */
     public static function createAnnotationMappingDriver(array $namespaces, array $directories, array $managerParameters = array(), $enabledParameter = false)
     {
-        $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);
diff --git a/Resources/config/orm.xml b/Resources/config/orm.xml
index 1c6eaed6f..6be99e981 100644
--- 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">