Allow generation into sub-namespaces

CHANGELOG.md

@@ -1,8 +1,8 @@
 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.

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,6 +56,7 @@ 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();
@@ -86,15 +87,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/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()]);
         }
     }

src/FileManager.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Bundle\MakerBundle;
 
+use Composer\Autoload\ClassLoader;
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Filesystem\Filesystem;
 
@@ -20,17 +21,19 @@
  *
  * @internal
  */
-final class FileManager
+class FileManager
 {
     private $fs;
     private $rootDirectory;
     /** @var SymfonyStyle */
     private $io;
 
+    private static $classLoader;
+
     public function __construct(Filesystem $fs, string $rootDirectory)
     {
         $this->fs = $fs;
-        $this->rootDirectory = $rootDirectory;
+        $this->rootDirectory = rtrim($this->realpath($rootDirectory).'/');
     }
 
     public function setIO(SymfonyStyle $io)
@@ -60,11 +63,81 @@ public function fileExists($path): bool
 
     public function relativizePath($absolutePath): string
     {
-        $relativePath = str_replace($this->rootDirectory, '.', $absolutePath);
+        // see if the path is even in the root
+        if (false === strpos($absolutePath, $this->rootDirectory)) {
+            return $absolutePath;
+        }
+
+        $absolutePath = $this->realPath($absolutePath);
+
+        $relativePath = ltrim(str_replace($this->rootDirectory, '', $absolutePath), '/');
+        if (0 === strpos($relativePath, './')) {
+            $relativePath = substr($relativePath, 2);
+        }
 
         return is_dir($absolutePath) ? rtrim($relativePath, '/').'/' : $relativePath;
     }
 
+    public function getPathForFutureClass(string $className)
+    {
+        // lookup is obviously modeled off of Composer's autoload logic
+        foreach ($this->getClassLoader()->getPrefixesPsr4() as $prefix => $paths) {
+            if (0 === strpos($className, $prefix)) {
+                $path = $paths[0].'/'.str_replace('\\', '/', str_replace($prefix, '', $className)).'.php';
+
+                return $this->relativizePath($path);
+            }
+        }
+
+        foreach ($this->getClassLoader()->getPrefixes() as $prefix => $paths) {
+            if (0 === strpos($className, $prefix)) {
+                $path = $paths[0].'/'.str_replace('\\', '/', $className).'.php';
+
+                return $this->relativizePath($path);
+            }
+        }
+
+        if ($this->getClassLoader()->getFallbackDirsPsr4()) {
+            $path = $this->getClassLoader()->getFallbackDirsPsr4()[0].'/'.str_replace('\\', '/', $className).'.php';
+
+            return $this->relativizePath($path);
+        }
+
+        if ($this->getClassLoader()->getFallbackDirs()) {
+            $path = $this->getClassLoader()->getFallbackDirs()[0].'/'.str_replace('\\', '/', $className).'.php';
+
+            return $this->relativizePath($path);
+        }
+
+        return null;
+    }
+
+    public function getNamespacePrefixForClass(string $className): string
+    {
+        foreach ($this->getClassLoader()->getPrefixesPsr4() as $prefix => $paths) {
+            if (0 === strpos($className, $prefix)) {
+                return $prefix;
+            }
+        }
+
+        return '';
+    }
+
+    private function getClassLoader(): ClassLoader
+    {
+        if (null === self::$classLoader) {
+            $autoloadPath = $this->absolutizePath('vendor/autoload.php');
+
+            if (!file_exists($autoloadPath)) {
+                throw new \Exception(sprintf('Could not find the autoload file: "%s"', $autoloadPath));
+            }
+
+            self::$classLoader = require $autoloadPath;
+        }
+
+        return self::$classLoader;
+    }
+
     private function absolutizePath($path): string
     {
         if (0 === strpos($path, '/')) {
@@ -73,4 +146,42 @@ private function absolutizePath($path): string
 
         return sprintf('%s/%s', $this->rootDirectory, $path);
     }
+
+    /**
+     * Resolve '../' in paths (like real_path), but for non-existent files.
+     *
+     * @param string $absolutePath
+     *
+     * @return string
+     */
+    private function realPath($absolutePath): string
+    {
+        $finalParts = [];
+        $currentIndex = -1;
+
+        foreach (explode('/', $absolutePath) as $pathPart) {
+            if ('..' === $pathPart) {
+                // we need to remove the previous entry
+                if (-1 === $currentIndex) {
+                    throw new \Exception(sprintf('Problem making path relative - is the path "%s" absolute?', $absolutePath));
+                }
+
+                unset($finalParts[$currentIndex]);
+                --$currentIndex;
+
+                continue;
+            }
+
+            $finalParts[] = $pathPart;
+            ++$currentIndex;
+        }
+
+        $finalPath = implode('/', $finalParts);
+        // Normalize: // => /
+        // Normalize: /./ => /
+        $finalPath = str_replace('//', '/', $finalPath);
+        $finalPath = str_replace('/./', '/', $finalPath);
+
+        return $finalPath;
+    }
 }