bug #311 Fix Entity directory does not exist (yceruto)

This PR was squashed before being merged into the 1.0-dev branch (closes #311).

Discussion
----------

Fix Entity directory does not exist

Closes #299 according to #185 (comment)

Also alternative for #185, #265 and #310

Commits
-------

5f37c5d Remove invalid field mapping
06f5399 Invalidating cached AnnotationDriver::$classNames to find new entities
8b7c291 Fix 'src/Entity' directory does not exist

Author: weaverryan

src/Doctrine/DoctrineHelper.php

@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
 use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
+use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\ORM\EntityManagerInterface;
@@ -145,6 +146,19 @@ public function getMetadata(string $classOrNamespace = null, bool $disconnected
                 foreach ($loaded as $m) {
                     $cmf->setMetadataFor($m->getName(), $m);
                 }
+
+                // Invalidating the cached AnnotationDriver::$classNames to find new Entity classes
+                $metadataDriver = $em->getConfiguration()->getMetadataDriverImpl();
+                if ($metadataDriver instanceof MappingDriverChain) {
+                    foreach ($metadataDriver->getDrivers() as $driver) {
+                        if ($driver instanceof AnnotationDriver) {
+                            $classNames = (new \ReflectionObject($driver))->getProperty('classNames');
+                            $classNames->setAccessible(true);
+                            $classNames->setValue($driver, null);
+                            $classNames->setAccessible(false);
+                        }
+                    }
+                }
             }
 
             foreach ($cmf->getAllMetadata() as $m) {

src/Maker/MakeEntity.php

@@ -36,7 +36,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 use Symfony\Component\Console\Question\Question;
-use Symfony\Component\Finder\SplFileInfo;
 
 /**
  * @author Javier Eguiluz <[email protected]>
@@ -100,20 +99,6 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
             return;
         }
 
-        $entityFinder = $this->fileManager->createFinder('src/Entity/')
-            // remove if/when we allow entities in subdirectories
-            ->depth('<1')
-            ->name('*.php');
-        $classes = [];
-        /** @var SplFileInfo $item */
-        foreach ($entityFinder as $item) {
-            if (!$item->getRelativePathname()) {
-                continue;
-            }
-
-            $classes[] = str_replace(['.php', '/'], ['', '\\'], $item->getRelativePathname());
-        }
-
         $argument = $command->getDefinition()->getArgument('name');
         $question = $this->createEntityClassQuestion($argument->getDescription());
         $value = $io->askQuestion($question);
@@ -363,7 +348,7 @@ private function askForNextField(ConsoleStyle $io, array $fields, string $entity
 
         // this is a normal field
         $data = ['fieldName' => $fieldName, 'type' => $type];
-        if ('string' == $type) {
+        if ('string' === $type) {
             // default to 255, avoid the question
             $data['length'] = $io->ask('Field length', 255, [Validator::class, 'validateLength']);
         } elseif ('decimal' === $type) {
@@ -467,23 +452,9 @@ private function printAvailableTypes(ConsoleStyle $io)
 
     private function createEntityClassQuestion(string $questionText): Question
     {
-        $entityFinder = $this->fileManager->createFinder('src/Entity/')
-            // remove if/when we allow entities in subdirectories
-            ->depth('<1')
-            ->name('*.php');
-        $classes = [];
-        /** @var SplFileInfo $item */
-        foreach ($entityFinder as $item) {
-            if (!$item->getRelativePathname()) {
-                continue;
-            }
-
-            $classes[] = str_replace('/', '\\', str_replace('.php', '', $item->getRelativePathname()));
-        }
-
         $question = new Question($questionText);
         $question->setValidator([Validator::class, 'notBlank']);
-        $question->setAutocompleterValues($classes);
+        $question->setAutocompleterValues($this->doctrineHelper->getEntitiesForAutocomplete());
 
         return $question;
     }

tests/fixtures/MakeEntityXmlMappingError/config/doctrine/User.orm.xml

@@ -7,6 +7,5 @@
         <id name="id" type="integer">
             <generator strategy="AUTO" />
         </id>
-        <one-to-many field="avatars" target-entity="UserAvatar" mapped-by="user" />
     </entity>
-</doctrine-mapping>
+</doctrine-mapping>