Make backing type a bool, since it defaults anyway on 1 of 2 options.

cakephp · Dec 25, 2023 · bef2b77 · bef2b77
1 parent 9be993d
commit bef2b77
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/Command/EnumCommand.php b/src/Command/EnumCommand.php
@@ -18,7 +18,6 @@
 
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleOptionParser;
-use InvalidArgumentException;
 
 /**
  * Enum code generator.
@@ -66,7 +65,7 @@ public function template(): string
     public function templateData(Arguments $arguments): array
     {
         $data = parent::templateData($arguments);
-        $data['backingType'] = $arguments->getOption('backing-type');
+        $data['backingType'] = $arguments->getOption('integer') ? 'int' : 'string';
 
         return $data;
     }
@@ -83,11 +82,10 @@ public function buildOptionParser(ConsoleOptionParser $parser): ConsoleOptionPar
 
         $parser->setDescription(
             'Bake backed enums for use in models.'
-        )->addOption('backing-type', [
-            'help' => 'The return type for the backed enum class',
-            'default' => 'string',
-            'choices' => ['string', 'int'],
-            'short' => 'b',
+        )->addOption('integer', [
+            'help' => 'Using backed enums with int instead of string as return type',
+            'boolean' => true,
+            'short' => 'i',
         ]);
 
         return $parser;

diff --git a/tests/TestCase/Command/EnumCommandTest.php b/tests/TestCase/Command/EnumCommandTest.php
@@ -61,7 +61,7 @@ public function testBakeEnum()
     public function testBakeEnumBackedInt()
     {
         $this->generatedFile = APP . 'Model/Enum/FooBar.php';
-        $this->exec('bake enum FooBar -b int', ['y']);
+        $this->exec('bake enum FooBar -i', ['y']);
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileExists($this->generatedFile);