Make the Generator class a service

Author: dunglas

src/Command/MakerCommand.php

@@ -40,12 +40,12 @@ final class MakerCommand extends Command
     private $checkDependencies = true;
     private $generator;
 
-    public function __construct(MakerInterface $maker, FileManager $fileManager)
+    public function __construct(MakerInterface $maker, FileManager $fileManager, Generator $generator)
     {
         $this->maker = $maker;
         $this->fileManager = $fileManager;
         $this->inputConfig = new InputConfiguration();
-        $this->generator = new Generator($this->fileManager, 'App\\');
+        $this->generator = $generator;
 
         parent::__construct();
     }
@@ -85,7 +85,7 @@ protected function interact(InputInterface $input, OutputInterface $output)
             $input->setArgument($argument->getName(), $value);
         }
 
-        $this->maker->interact($input, $this->io, $this, $this->generator);
+        $this->maker->interact($input, $this->io, $this);
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)

src/DependencyInjection/CompilerPass/MakeCommandRegistrationPass.php

@@ -38,6 +38,7 @@ public function process(ContainerBuilder $container)
             )->setArguments([
                 new Reference($id),
                 new Reference('maker.file_manager'),
+                new Reference('maker.generator'),
             ])->addTag('console.command', ['command' => $class::getCommandName()]);
         }
     }

src/GeneratorAwareMakerInterface.php

@@ -21,7 +21,6 @@
 use Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
 use Symfony\Bundle\MakerBundle\Generator;
-use Symfony\Bundle\MakerBundle\GeneratorAwareMakerInterface;
 use Symfony\Bundle\MakerBundle\InputAwareMakerInterface;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\Str;
@@ -43,17 +42,25 @@
  * @author Ryan Weaver <[email protected]>
  * @author Kévin Dunglas <[email protected]>
  */
-final class MakeEntity extends AbstractMaker implements InputAwareMakerInterface, GeneratorAwareMakerInterface
+final class MakeEntity extends AbstractMaker implements InputAwareMakerInterface
 {
     private $fileManager;
     private $doctrineHelper;
     private $projectDirectory;
+    private $generator;
 
-    public function __construct(FileManager $fileManager, string $projectDirectory, DoctrineHelper $doctrineHelper)
+    public function __construct(FileManager $fileManager, string $projectDirectory, DoctrineHelper $doctrineHelper, Generator $generator = null)
     {
         $this->fileManager = $fileManager;
         $this->projectDirectory = $projectDirectory;
         $this->doctrineHelper = $doctrineHelper;
+
+        if (null === $generator) {
+            @trigger_error(sprintf('Passing a "%s" instance as 4th argument is mandatory since version 1.5.', Generator::class), E_USER_DEPRECATED);
+            $this->generator = new Generator($fileManager, 'App\\');
+        } else {
+            $this->generator = $generator;
+        }
     }
 
     public static function getCommandName(): string
@@ -75,7 +82,7 @@ public function configureCommand(Command $command, InputConfiguration $inputConf
         $inputConf->setArgumentAsNonInteractive('name');
     }
 
-    public function interact(InputInterface $input, ConsoleStyle $io, Command $command, Generator $generator = null)
+    public function interact(InputInterface $input, ConsoleStyle $io, Command $command)
     {
         if ($input->getArgument('name')) {
             return;
@@ -116,7 +123,7 @@ public function interact(InputInterface $input, ConsoleStyle $io, Command $comma
         if (
             !$input->getOption('api-resource') &&
             class_exists(ApiResource::class) &&
-            !class_exists($generator->createClassNameDetails($value, 'Entity\\')->getFullName())
+            !class_exists($this->generator->createClassNameDetails($value, 'Entity\\')->getFullName())
         ) {
             $description = $command->getDefinition()->getOption('api-resource')->getDescription();
             $question = new ConfirmationQuestion($description, false);

src/Maker/MakeEntity.php

@@ -29,6 +29,7 @@
                 <argument type="service" id="maker.file_manager" />
                 <argument>%kernel.project_dir%</argument>
                 <argument type="service" id="maker.doctrine_helper" />
+                <argument type="service" id="maker.generator" />
                 <tag name="maker.command" />
             </service>
 

src/Resources/config/makers.xml

@@ -26,5 +26,10 @@
             <service id="maker.doctrine_helper" class="Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper">
                 <argument type="service" id="doctrine" on-invalid="ignore"/>
             </service>
+
+            <service id="maker.generator" class="Symfony\Bundle\MakerBundle\Generator">
+                <argument type="service" id="maker.file_manager" />
+                <argument>App\</argument>
+            </service>
         </services>
 </container>

src/Resources/config/services.xml

@@ -6,6 +6,7 @@
 use Symfony\Bundle\MakerBundle\Command\MakerCommand;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\FileManager;
+use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\MakerInterface;
 use Symfony\Component\Console\Tester\CommandTester;
 
@@ -26,7 +27,7 @@ public function testExceptionOnMissingDependencies()
 
         $fileManager = $this->createMock(FileManager::class);
 
-        $command = new MakerCommand($maker, $fileManager);
+        $command = new MakerCommand($maker, $fileManager, new Generator($fileManager, 'App\\'));
         // needed because it's normally set by the Application
         $command->setName('make:foo');
         $tester = new CommandTester($command);