bug #289 Class not found on make:entity --regenerate (mertoksuz, weaverryan)

This PR was merged into the 1.0-dev branch.

Discussion
----------

Class not found on make:entity --regenerate

That PR fixes #207.

Commits
-------

a3a621c using a more specific try-catch
9e45f42 test fix
79fca6f handling both mapping exception

Author: weaverryan

src/Doctrine/DoctrineHelper.php

@@ -16,7 +16,8 @@
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\MappingException;
+use Doctrine\ORM\Mapping\MappingException as ORMMappingException;
+use Doctrine\Common\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
 use Symfony\Bridge\Doctrine\ManagerRegistry;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
@@ -132,7 +133,9 @@ public function getMetadata(string $classOrNamespace = null, bool $disconnected
             if ($disconnected) {
                 try {
                     $loaded = $cmf->getAllMetadata();
-                } catch (MappingException $e) {
+                } catch (ORMMappingException $e) {
+                    $loaded = $cmf instanceof AbstractClassMetadataFactory ? $cmf->getLoadedMetadata() : [];
+                } catch (PersistenceMappingException $e) {
                     $loaded = $cmf instanceof AbstractClassMetadataFactory ? $cmf->getLoadedMetadata() : [];
                 }