Fix AddPrefix & Init commands (#185)

Author: theofidry

src/Console/Command/AddPrefixCommand.php

@@ -44,6 +44,7 @@ final class AddPrefixCommand extends BaseCommand
 
     private $fileSystem;
     private $scoper;
+    private $init = false;
 
     /**
      * @inheritdoc
@@ -393,7 +394,9 @@ private function retrieveConfig(InputInterface $input, OutputInterface $output,
         if (null === $configFile) {
             $configFile = $this->makeAbsolutePath(self::CONFIG_FILE_DEFAULT);
 
-            if (false === file_exists($configFile)) {
+            if (false === file_exists($configFile) && false === $this->init) {
+                $this->init = true;
+
                 $initCommand = $this->getApplication()->find('init');
 
                 $initInput = new StringInput('');
@@ -409,29 +412,38 @@ private function retrieveConfig(InputInterface $input, OutputInterface $output,
                     OutputStyle::VERBOSITY_DEBUG
                 );
 
-                return Configuration::load(null);
+                return self::retrieveConfig($input, $output, $io);
+            }
+
+            if ($this->init) {
+                $configFile = null;
             }
         } else {
             $configFile = $this->makeAbsolutePath($configFile);
         }
 
-        if (false === file_exists($configFile)) {
+        if (null === $configFile) {
+            $io->writeln(
+                'Loading without configuration file.',
+                OutputStyle::VERBOSITY_DEBUG
+            );
+        } elseif (false === file_exists($configFile)) {
             throw new RuntimeException(
                 sprintf(
-                    'Could not find the configuration file "<comment>%s</comment>".',
+                    'Could not find the configuration file "%s".',
                     $configFile
                 )
             );
+        } else {
+            $io->writeln(
+                sprintf(
+                    'Using the configuration file "%s".',
+                    $configFile
+                ),
+                OutputStyle::VERBOSITY_DEBUG
+            );
         }
 
-        $io->writeln(
-            sprintf(
-                'Using the configuration file "<comment>%s</comment>".',
-                $configFile
-            ),
-            OutputStyle::VERBOSITY_DEBUG
-        );
-
         $config = Configuration::load($configFile);
 
         return $this->retrievePaths($input, $config);

src/Console/Command/InitCommand.php

@@ -82,6 +82,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 
         $configFile = $this->retrieveConfig($input, $io);
 
+        if (null === $configFile) {
+            $io->writeln('Skipping configuration file generator.');
+
+            return 0;
+        }
+
         $this->fileSystem->copy(self::CONFIG_FILE_TEMPLATE, $configFile);
 
         $io->writeln([

tests/Console/Command/AddPrefixCommandTest.php

@@ -798,7 +798,7 @@ public function test_throws_an_error_when_passing_a_non_existent_config()
         } catch (RuntimeException $exception) {
             $this->assertSame(
                 sprintf(
-                    'Could not find the configuration file "<comment>%sunknown</comment>".',
+                    'Could not find the configuration file "%sunknown".',
                     $this->tmp.DIRECTORY_SEPARATOR
                 ),
                 $exception->getMessage()