[DoctrineBundle] fixed Doctrine extension to always create aliases for entities in the Entities/ directory

src/Symfony/Framework/DoctrineBundle/DependencyInjection/DoctrineExtension.php

@@ -208,11 +208,13 @@ class DoctrineExtension extends LoaderExtension
 
         if (isset($bundleDirs[$namespace]))
         {
+          $type = false;
           if (is_dir($dir = $bundleDirs[$namespace].'/'.$class.'/Resources/config/doctrine/metadata'))
           {
             $type = $this->detectMappingType($dir);
           }
-          elseif (is_dir($dir = $bundleDirs[$namespace].'/'.$class.'/Entities'))
+
+          if (is_dir($dir = $bundleDirs[$namespace].'/'.$class.'/Entities'))
           {
             $type = 'annotation';
 
@@ -227,10 +229,6 @@ class DoctrineExtension extends LoaderExtension
               $ormConfigDef->addMethodCall('addEntityAlias', array($className, $alias));
             }
           }
-          else
-          {
-            $type = false;
-          }
 
           if (false !== $type)
           {