Merge pull request #32 from gacela-project/feature/change-default-lon…

…g-name-command-generator Using long name by default in the generator code commands
gacela-project · Jul 4, 2021 · ae92905 · ae92905
2 parents 49c262a + 2c40679
commit ae92905
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/CodeGenerator/Domain/FileContentGenerator.php b/src/CodeGenerator/Domain/FileContentGenerator.php
@@ -19,11 +19,11 @@ public function __construct(CodeTemplateInterface $codeTemplate)
     /**
      * @return string path result where the file was generated
      */
-    public function generate(CommandArguments $commandArguments, string $filename, bool $withLongName): string
+    public function generate(CommandArguments $commandArguments, string $filename, bool $withShortName): string
     {
         $this->mkdir($commandArguments->directory());
 
-        $moduleName = $withLongName ? $commandArguments->basename() : '';
+        $moduleName = $withShortName ? '' : $commandArguments->basename();
         $className = $moduleName . $filename;
 
         $path = sprintf('%s/%s.php', $commandArguments->directory(), $className);

diff --git a/src/CodeGenerator/Infrastructure/Command/MakeFileCommand.php b/src/CodeGenerator/Infrastructure/Command/MakeFileCommand.php
@@ -35,7 +35,7 @@ protected function configure(): void
         $this->setDescription('Generate a ' . FilenameSanitizer::expectedFilenames())
             ->addArgument('path', InputArgument::REQUIRED, 'The file path. For example "App/TestModule/TestSubModule"')
             ->addArgument('filenames', InputArgument::REQUIRED | InputArgument::IS_ARRAY, FilenameSanitizer::expectedFilenames(' | '))
-            ->addOption('long-name', 'l', InputOption::VALUE_NONE, 'Add module as prefix to the class name');
+            ->addOption('short-name', 's', InputOption::VALUE_NONE, 'Remove module prefix to the class name');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -48,16 +48,17 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         /** @var string $path */
         $path = $input->getArgument('path');
         $commandArguments = $this->argumentsParser->parse($path);
+        $shortName = (bool)$input->getOption('short-name');
 
         foreach ($filenames as $filename) {
             $fullPath = $this->fileContentGenerator->generate(
                 $commandArguments,
                 $filename,
-                (bool)$input->getOption('long-name')
+                $shortName
             );
             $output->writeln("> Path '$fullPath' created successfully");
         }
 
-        return 0;
+        return self::SUCCESS;
     }
 }
diff --git a/src/CodeGenerator/Infrastructure/Command/MakeModuleCommand.php b/src/CodeGenerator/Infrastructure/Command/MakeModuleCommand.php
@@ -31,20 +31,21 @@ protected function configure(): void
     {
         $this->setDescription('Generate a basic module with an empty ' . FilenameSanitizer::expectedFilenames())
             ->addArgument('path', InputArgument::REQUIRED, 'The file path. For example "App/TestModule/TestSubModule"')
-            ->addOption('long-name', 'l', InputOption::VALUE_NONE, 'Add module as prefix to the class name');
+            ->addOption('short-name', 's', InputOption::VALUE_NONE, 'Remove module prefix to the class name');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         /** @var string $path */
         $path = $input->getArgument('path');
         $commandArguments = $this->argumentsParser->parse($path);
+        $shortName = (bool)$input->getOption('short-name');
 
         foreach (FilenameSanitizer::EXPECTED_FILENAMES as $filename) {
             $fullPath = $this->fileContentGenerator->generate(
                 $commandArguments,
                 $filename,
-                (bool)$input->getOption('long-name')
+                $shortName
             );
             $output->writeln("> Path '$fullPath' created successfully");
         }
@@ -53,6 +54,6 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $moduleName = end($pieces);
         $output->writeln("Module '$moduleName' created successfully");
 
-        return 0;
+        return self::SUCCESS;
     }
 }