Rename option backed to backing-type defaulting to string.

src/Command/EnumCommand.php

@@ -18,7 +18,7 @@
 
 use Cake\Console\Arguments;
 use Cake\Console\ConsoleOptionParser;
 use InvalidArgumentException;
 
 /**
  * Enum code generator.
@@ -66,13 +66,7 @@
     public function templateData(Arguments $arguments): array
     {
         $data = parent::templateData($arguments);
-
-        $backed = $arguments->getOption('backed');
-        if ($backed && !in_array($backed, ['string', 'int'], true)) {
-            throw new InvalidArgumentException('Backed enums must be of type `string` or `int`');
-        }
-
-        $data['backed'] = $backed;
+        $data['backingType'] = $arguments->getOption('backing-type');
 
         return $data;
     }
@@ -88,9 +82,11 @@
         $parser = $this->_setCommonOptions($parser);
 
         $parser->setDescription(
-            'Bake (backed) enums for use in models.'
-        )->addOption('backed', [
-            'help' => 'Valid options are `string` for string columns or `int` for tinyinteger columns.',
+            'Bake enums for use in models.'
+        )->addOption('backing-type', [
+            'help' => 'The return type for the enum class',
+            'default' => 'string',
+            'choices' => ['string', 'int'],
             'short' => 'b',
         ]);
 

templates/bake/Model/enum.twig

@@ -22,7 +22,7 @@
 }) }}
 
 {{ DocBlock.classDescription(name, 'Enum', [])|raw }}
-enum {{ name }}{{ backed ? ': ' ~ backed : ''}} implements EnumLabelInterface
+enum {{ name }}: {{ backingType }} implements EnumLabelInterface
 {
     /**
      * @return string

tests/TestCase/Command/EnumCommandTest.php

@@ -54,30 +54,14 @@ public function testBakeEnum()
     }
 
     /**
-     * test baking an enum
-     *
-     * @return void
-     */
-    public function testBakeEnumBacked()
-    {
-        $this->generatedFile = APP . 'Model/Enum/FooBar.php';
-        $this->exec('bake enum FooBar --backed string', ['y']);
-
-        $this->assertExitCode(CommandInterface::CODE_SUCCESS);
-        $this->assertFileExists($this->generatedFile);
-        $result = file_get_contents($this->generatedFile);
-        $this->assertSameAsFile(__FUNCTION__ . '.php', $result);
-    }
-
-    /**
-     * test baking an enum
+     * test baking an enum with int return type
      *
      * @return void
      */
     public function testBakeEnumBackedInt()
     {
         $this->generatedFile = APP . 'Model/Enum/FooBar.php';
-        $this->exec('bake enum FooBar --backed int', ['y']);
+        $this->exec('bake enum FooBar -b int', ['y']);
 
         $this->assertExitCode(CommandInterface::CODE_SUCCESS);
         $this->assertFileExists($this->generatedFile);

tests/comparisons/Model/testBakeEnum.php

@@ -9,7 +9,7 @@
 /**
  * FooBar Enum
  */
-enum FooBar implements EnumLabelInterface
+enum FooBar: string implements EnumLabelInterface
 {
     /**
      * @return string