Merge remote-tracking branch 'upstream/master'

Author: sadikoff

CHANGELOG.md

@@ -1,8 +1,19 @@
 1.1
 ===
 
-* [BC BREAK] The MakerInterface changed: `writeNextStepsMessage`
-  was renamed to `writeSuccessMessage`. You should now extend
-  `AbstractMaker` instead of implementing the interface directly,
-  and use `parent::writeSuccessMessage()` to get the normal success
-  message after the command.
+* [BC BREAK] The MakerInterface changed: `getParameters()`, `getFiles()`
+  and `writeNextStepsMessage()` were removed and `generate()` was added
+  in their place. We recommend extending `AbstractMaker` instead of implementing
+  the interface directly, and use `$this->writeSuccessMessage()` to get
+  the normal "success" message after the command #120 via @weaverryan
+
+* Added new `make:migration` command, which wraps the normal
+  `doctrine:migrations:diff` command #97 via @weaverryan
+
+* Added new `make:fixtures` command to generate an empty fixtures class
+  #105 via @javiereguiluz
+
+* Added PHPDoc to generated entity repositories so that your IDE knows
+  what type of objects are returned #116 @enleur
+
+* Allowed generation of all classes into sub-namespaces #120 via @weaverryan

composer.json

@@ -21,6 +21,7 @@
         "symfony/http-kernel": "^3.4|^4.0"
     },
     "require-dev": {
+        "allocine/twigcs": "^3.0",
         "friendsofphp/php-cs-fixer": "^2.8",
         "symfony/phpunit-bridge": "^3.4|^4.0",
         "symfony/process": "^3.4|^4.0"

src/Command/MakerCommand.php

@@ -15,7 +15,7 @@
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
 use Symfony\Bundle\MakerBundle\DependencyBuilder;
 use Symfony\Bundle\MakerBundle\Exception\RuntimeCommandException;
-use Symfony\Bundle\MakerBundle\ExtraGenerationMakerInterface;
+use Symfony\Bundle\MakerBundle\FileManager;
 use Symfony\Bundle\MakerBundle\Generator;
 use Symfony\Bundle\MakerBundle\InputConfiguration;
 use Symfony\Bundle\MakerBundle\MakerInterface;
@@ -33,16 +33,16 @@
 final class MakerCommand extends Command
 {
     private $maker;
-    private $generator;
+    private $fileManager;
     private $inputConfig;
     /** @var ConsoleStyle */
     private $io;
     private $checkDependencies = true;
 
-    public function __construct(MakerInterface $maker, Generator $generator)
+    public function __construct(MakerInterface $maker, FileManager $fileManager)
     {
         $this->maker = $maker;
-        $this->generator = $generator;
+        $this->fileManager = $fileManager;
         $this->inputConfig = new InputConfiguration();
 
         parent::__construct();
@@ -56,12 +56,14 @@ protected function configure()
     protected function initialize(InputInterface $input, OutputInterface $output)
     {
         $this->io = new ConsoleStyle($input, $output);
+        $this->fileManager->setIo($this->io);
 
         if ($this->checkDependencies) {
             $dependencies = new DependencyBuilder();
             $this->maker->configureDependencies($dependencies);
-            if ($missingPackages = $dependencies->getMissingDependencies()) {
-                throw new RuntimeCommandException(sprintf("Missing package%s: to use the %s command, run: \n\ncomposer require %s", 1 === count($missingPackages) ? '' : 's', $this->getName(), implode(' ', $missingPackages)));
+
+            if ($missingPackagesMessage = $dependencies->getMissingPackagesMessage($this->getName())) {
+                throw new RuntimeCommandException($missingPackagesMessage);
             }
         }
     }
@@ -86,15 +88,14 @@ protected function interact(InputInterface $input, OutputInterface $output)
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->generator->setIO($this->io);
-        $params = $this->maker->getParameters($input);
-        $this->generator->generate($params, $this->maker->getFiles($params));
+        $generator = new Generator($this->fileManager, 'App\\');
 
-        if ($this->maker instanceof ExtraGenerationMakerInterface) {
-            $this->maker->afterGenerate($this->io, $params);
-        }
+        $this->maker->generate($input, $this->io, $generator);
 
-        $this->maker->writeSuccessMessage($params, $this->io);
+        // sanity check for custom makers
+        if ($generator->hasPendingOperations()) {
+            throw new \LogicException('Make sure to call the writeChanges() method on the generator.');
+        }
     }
 
     public function setApplication(Application $application = null)

src/DependencyBuilder.php

@@ -14,6 +14,7 @@
 final class DependencyBuilder
 {
     private $dependencies = [];
+    private $devDependencies = [];
 
     /**
      * Add a dependency that will be reported if the given class is missing.
@@ -22,52 +23,117 @@ final class DependencyBuilder
      * the user if other required dependencies are missing. An example
      * is the "validator" when trying to work with forms.
      */
-    public function addClassDependency(string $class, string $package, bool $required = true)
+    public function addClassDependency(string $class, string $package, bool $required = true, bool $devDependency = false)
     {
-        $this->dependencies[$class] = [
-            'name' => $package,
-            'required' => $required,
-        ];
+        if ($devDependency) {
+            $this->devDependencies[] = [
+                'class' => $class,
+                'name' => $package,
+                'required' => $required,
+            ];
+        } else {
+            $this->dependencies[] = [
+                'class' => $class,
+                'name' => $package,
+                'required' => $required,
+            ];
+        }
     }
 
+    /**
+     * @internal
+     */
     public function getMissingDependencies(): array
     {
-        $missingPackages = [];
-        $missingOptionalPackages = [];
-
-        foreach ($this->dependencies as $class => $package) {
-            if (class_exists($class)) {
-                continue;
-            }
+        return $this->calculateMissingDependencies($this->dependencies);
+    }
 
-            if (true === $package['required']) {
-                $missingPackages[] = $package['name'];
-            } else {
-                $missingOptionalPackages[] = $package['name'];
-            }
-        }
+    /**
+     * @internal
+     */
+    public function getMissingDevDependencies(): array
+    {
+        return $this->calculateMissingDependencies($this->devDependencies);
+    }
 
-        if (empty($missingPackages)) {
-            return [];
-        }
+    /**
+     * @internal
+     */
+    public function getAllRequiredDependencies(): array
+    {
+        return $this->getRequiredDependencyNames($this->dependencies);
+    }
 
-        return array_merge($missingPackages, $missingOptionalPackages);
+    /**
+     * @internal
+     */
+    public function getAllRequiredDevDependencies(): array
+    {
+        return $this->getRequiredDependencyNames($this->devDependencies);
     }
 
     /**
      * @internal
      */
-    public function getAllRequiredDependencies(): array
+    public function getMissingPackagesMessage(string $commandName): string
+    {
+        $packages = $this->getMissingDependencies();
+        $packagesDev = $this->getMissingDevDependencies();
+
+        if (empty($packages) && empty($packagesDev)) {
+            return '';
+        }
+
+        $packagesCount = count($packages) + count($packagesDev);
+
+        $message = sprintf(
+            "Missing package%s: to use the %s command, run:\n",
+            $packagesCount > 1 ? 's' : '',
+            $commandName
+        );
+
+        if (!empty($packages)) {
+            $message .= sprintf("\ncomposer require %s", implode(' ', $packages));
+        }
+
+        if (!empty($packagesDev)) {
+            $message .= sprintf("\ncomposer require %s --dev", implode(' ', $packagesDev));
+        }
+
+        return $message;
+    }
+
+    private function getRequiredDependencyNames(array $dependencies)
     {
-        $dependencies = [];
-        foreach ($this->dependencies as $class => $package) {
+        $packages = [];
+        foreach ($dependencies as $package) {
             if (!$package['required']) {
                 continue;
             }
+            $packages[] = $package['name'];
+        }
 
-            $dependencies[] = $package['name'];
+        return $packages;
+    }
+
+    private function calculateMissingDependencies(array $dependencies)
+    {
+        $missingPackages = [];
+        $missingOptionalPackages = [];
+        foreach ($dependencies as $package) {
+            if (class_exists($package['class'])) {
+                continue;
+            }
+            if (true === $package['required']) {
+                $missingPackages[] = $package['name'];
+            } else {
+                $missingOptionalPackages[] = $package['name'];
+            }
+        }
+        if (empty($missingPackages)) {
+            return [];
         }
 
-        return $dependencies;
+        return array_merge($missingPackages, $missingOptionalPackages);
     }
 }

src/DependencyInjection/CompilerPass/MakeCommandRegistrationPass.php

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