From 47aee04459012052b84832947990b1e57afed3eb Mon Sep 17 00:00:00 2001
From: "Jonathan H. Wage" <jonwage@gmail.com>
Date: Fri, 26 Feb 2010 13:12:46 -0500
Subject: [PATCH] [DoctrineBundle] Integrating the new Doctrine 2.0 entity
 alias feature for the query language

---
 .../DependencyInjection/DoctrineExtension.php         | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index 5924fb7131d7..cbadc847c5a6 100644
--- a/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -213,6 +213,17 @@ public function ormLoad($config)
           elseif (is_dir($dir = $bundleDirs[$namespace].'/'.$class.'/Entities'))
           {
             $type = 'annotation';
+
+            $reader = new \Doctrine\Common\Annotations\AnnotationReader();
+            $reader->setDefaultAnnotationNamespace('Doctrine\\ORM\\Mapping\\');
+            $annotationDriver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, $dir);
+            $classNames = $annotationDriver->getAllClassNames();
+            foreach ($classNames as $className)
+            {
+              $alias = substr_replace($className, '', 0, strpos($className, '\\') + 1);
+              $alias = str_replace('\Entities\\', '\\', $alias);
+              $ormConfigDef->addMethodCall('addEntityAlias', array($className, $alias));
+            }
           }
           else
           {