create schema cleanups

oliwierptak · Jan 29, 2022 · 576e8d3 · 576e8d3
1 parent cfaf32e
commit 576e8d3
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/src/Popo/Command/CreateSchemaCommand.php b/src/Popo/Command/CreateSchemaCommand.php
@@ -44,7 +44,6 @@ protected function configure(): void
      */
     protected function executeCommand(InputInterface $input, OutputInterface $output): int
     {
-        $yn = '<fg=gray>[</><fg=white>y</><fg=gray>/n]</>';
         $configurator = new PopoConfigurator();
         $output->writeln('');
         $helper = $this->getHelper('question');
@@ -54,7 +53,7 @@ protected function executeCommand(InputInterface $input, OutputInterface $output
         $configurator->setSchemaPath($helper->ask($input, $output, $question));
 
         $question = new Question('<fg=green>namespace</> <fg=gray>[Popo]</>: ', 'Popo');
-        $question->setAutocompleterValues(['\Popo']);
+        $question->setAutocompleterValues(['Popo']);
         $namespace = $helper->ask($input, $output, $question);
         $configurator->setNamespace($namespace);
 
@@ -90,7 +89,7 @@ protected function executeCommand(InputInterface $input, OutputInterface $output
       
   BarItem:
     property: [
-      {name: id, type: integer}
+      {name: id, type: int}
       {name: title, default: A bar item}
     ]}}
 ',
@@ -119,9 +118,7 @@ protected function executeCommand(InputInterface $input, OutputInterface $output
             }
         }
 
-        $h = fopen($configurator->getSchemaPath(), 'w');
-        fputs($h, $generatedSchema);
-        fclose($h);
+        $this->saveSchemaFile($configurator, $generatedSchema);
 
         $output->writeln('');
         $output->writeln('<fg=green>Saved schema file under</>: ' . $configurator->getSchemaPath());
@@ -131,6 +128,25 @@ protected function executeCommand(InputInterface $input, OutputInterface $output
 
         $configurator->setSchemaFilenameMask('*.yml');
 
+        return $this->runCommand($configurator, $output);
+    }
+
+    protected function saveSchemaFile(PopoConfigurator $configurator, string $generatedSchema): void
+    {
+        $handle = fopen($configurator->getSchemaPath(), 'w');
+        fputs($handle, $generatedSchema);
+        fclose($handle);
+    }
+
+    /**
+     * @param \Popo\PopoConfigurator $configurator
+     * @param \Symfony\Component\Console\Output\OutputInterface $output
+     *
+     * @return int
+     * @throws \Exception
+     */
+    protected function runCommand(PopoConfigurator $configurator, OutputInterface $output): int
+    {
         $command = $this->getApplication()->find(GenerateCommand::COMMAND_NAME);
 
         $arguments = [
@@ -142,18 +158,4 @@ protected function executeCommand(InputInterface $input, OutputInterface $output
 
         return $command->run($parameters, $output);
     }
-
-    protected function generateFooProperties(): string
-    {
-        return '';
-    }
-
-    protected function generateBarProperties(): string
-    {
-        return '
-    {name: id, type: integer}
-    {name: title, default: Lorem Ipsum}
-    {name: bar, type: popo, default: Bar::class}
-        ';
-    }
 }