Merge pull request #179 from dunglas/fix-entity-regenerator-test

Fix the EntityRegenerator on Mac

Author: weaverryan

.php_cs.dist

@@ -3,6 +3,18 @@
 if (!file_exists(__DIR__.'/src')) {
     exit(0);
 }
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__.'/src')
+    // the PHP template files are a bit special
+    ->notName('*.tpl.php')
+;
+
+if (\PHP_VERSION_ID < 70100) {
+    // EntityRegenerator works only with PHP 7.1+
+    $finder->notName('EntityRegenerator.php');
+}
+
 return PhpCsFixer\Config::create()
     ->setRules(array(
         '@Symfony' => true,
@@ -22,10 +34,5 @@ EOF
         ]
     ))
     ->setRiskyAllowed(true)
-    ->setFinder(
-        PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/src')
-            // the PHP template files are a bit special
-            ->notName('*.tpl.php')
-    )
+    ->setFinder($finder)
 ;

src/Doctrine/EntityRegenerator.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
+use Doctrine\Common\Persistence\Mapping\MappingException as CommonMappingException;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Doctrine\ORM\Mapping\MappingException;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
@@ -43,7 +44,7 @@ public function regenerateEntities(string $classOrNamespace)
     {
         try {
             $metadata = $this->doctrineHelper->getMetadata($classOrNamespace);
-        } catch (MappingException $mappingException) {
+        } catch (MappingException | CommonMappingException $mappingException) {
             $metadata = $this->doctrineHelper->getMetadata($classOrNamespace, true);
         }