Merge branch 'master' into configurable_namespace

Author: weaverryan

src/Doctrine/EntityRegenerator.php

@@ -30,7 +30,7 @@ final class EntityRegenerator
     private $generator;
     private $overwrite;
 
-    public function __construct(DoctrineHelper $doctrineHelper, FileManager $fileManager, Generator $generator, string $projectDirectory, bool $overwrite)
+    public function __construct(DoctrineHelper $doctrineHelper, FileManager $fileManager, Generator $generator, bool $overwrite)
     {
         $this->doctrineHelper = $doctrineHelper;
         $this->fileManager = $fileManager;

src/Maker/MakeController.php

@@ -14,7 +14,6 @@
 use Doctrine\Common\Annotations\Annotation;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
-use Symfony\Bundle\MakerBundle\FileManager;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\Str;
@@ -29,13 +28,6 @@
  */
 final class MakeController extends AbstractMaker
 {
-    private $fileManager;
-
-    public function __construct(FileManager $fileManager)
-    {
-        $this->fileManager = $fileManager;
-    }
-
     public static function getCommandName(): string
     {
         return 'make:controller';

src/Maker/MakeEntity.php

@@ -46,16 +46,13 @@ final class MakeEntity extends AbstractMaker implements InputAwareMakerInterface
 {
     private $fileManager;
     private $doctrineHelper;
-    private $projectDirectory;
-    private $entityNamespace;
     private $generator;
 
     public function __construct(FileManager $fileManager, DoctrineHelper $doctrineHelper, string $projectDirectory, Generator $generator = null)
     {
         $this->fileManager = $fileManager;
         $this->doctrineHelper = $doctrineHelper;
-        $this->projectDirectory = $projectDirectory;
-        $this->entityNamespace = $doctrineHelper->getEntityNamespace();
+        // $projectDirectory is unused, argument kept for BC
 
         if (null === $generator) {
             @trigger_error(sprintf('Passing a "%s" instance as 4th argument is mandatory since version 1.5.', Generator::class), E_USER_DEPRECATED);
@@ -810,7 +807,7 @@ private function isClassInVendor(string $class): bool
 
     private function regenerateEntities(string $classOrNamespace, bool $overwrite, Generator $generator)
     {
-        $regenerator = new EntityRegenerator($this->doctrineHelper, $this->fileManager, $generator, $this->projectDirectory, $overwrite);
+        $regenerator = new EntityRegenerator($this->doctrineHelper, $this->fileManager, $generator, $overwrite);
         $regenerator->regenerateEntities($classOrNamespace);
     }