Move extension root condition to BaseGenerator class.

Author: Chi-teck

src/Command/BaseGenerator.php

@@ -100,8 +100,10 @@ protected function configure() {
   protected function initialize(InputInterface $input, OutputInterface $output) {
     $this->getHelperSet()->setCommand($this);
     $this->getHelper('dcg_renderer')->addPath($this->templatePath);
-    $this->directory = $input->getOption('directory') ?
-      Utils::normalizePath($input->getOption('directory')) : getcwd();
+
+    $directory_option = $input->getOption('directory');
+    $directory = $directory_option ? Utils::normalizePath($directory_option) : getcwd();
+    $this->directory = Utils::getExtensionRoot($directory) ?: $directory;
   }
 
   /**

src/Helper/Dumper.php

@@ -22,13 +22,6 @@ class Dumper extends Helper {
    */
   public $filesystem;
 
-  /**
-   * The base directory.
-   *
-   * @var string
-   */
-  protected $baseDirectory;
-
   /**
    * Input instance.
    *
@@ -97,11 +90,7 @@ public function dump(InputInterface $input, OutputInterface $output) {
     /** @var \DrupalCodeGenerator\Command\GeneratorInterface $command */
     $command = $this->getHelperSet()->getCommand();
 
-    $directory = $command->getDirectory();
-    $extension_root = Utils::getExtensionRoot($directory);
-    $this->baseDirectory = ($extension_root ?: $directory) . '/';
-
-    $dumped_files = $this->doDump($command->getFiles());
+    $dumped_files = $this->doDump($command->getFiles(), $command->getDirectory());
 
     $input->setInteractive($interactive);
     return $dumped_files;
@@ -112,11 +101,13 @@ public function dump(InputInterface $input, OutputInterface $output) {
    *
    * @param array $files
    *   Files to dump.
+   * @param string $directory
+   *   Directory where to dump the files.
    *
    * @return array
    *   List of created or updated files.
    */
-  protected function doDump(array $files) {
+  protected function doDump(array $files, $directory) {
     $dumped_files = [];
 
     foreach ($files as $file_name => $file_info) {
@@ -126,7 +117,7 @@ protected function doDump(array $files) {
 
       $is_directory = $content === NULL;
 
-      $file_path = $this->baseDirectory . $file_name;
+      $file_path = $directory . '/' . $file_name;
       if ($this->filesystem->exists($file_path) && !$is_directory) {
         $action = isset($file_info['action']) ? $file_info['action'] : 'replace';
         if ($action == 'replace') {