fix(console): render nullable enum arguments (#1711)

Author: aazsamir

packages/console/src/Actions/RenderConsoleCommand.php

@@ -63,13 +63,7 @@ private function renderArgument(ConsoleArgumentDefinition $argument): string
             return $formattedArgumentName->wrap('<style="fg-gray dim"><</style>', '<style="fg-gray dim">></style>')->toString();
         }
 
-        $defaultValue = match (true) {
-            $argument->default === true => 'true',
-            $argument->default === false => 'false',
-            is_null($argument->default) => 'null',
-            is_array($argument->default) => 'array',
-            default => "{$argument->default}",
-        };
+        $defaultValue = $this->getArgumentDefaultValue($argument);
 
         return str()
             ->append(str('[')->wrap('<style="fg-gray dim">', '</style>'))
@@ -89,11 +83,24 @@ private function renderEnumArgument(ConsoleArgumentDefinition $argument): string
 
         $partsAsString = ' {<style="fg-blue">' . implode('|', $parts) . '</style>}';
         $line = "<style=\"fg-blue\">{$argument->name}</style>";
+        $defaultValue = $this->getArgumentDefaultValue($argument);
 
         if ($argument->hasDefault) {
-            return "[{$line}={$argument->default->value}{$partsAsString}]";
+            return "[{$line}={$defaultValue}{$partsAsString}]";
         }
 
         return "<{$line}{$partsAsString}>";
     }
+
+    private function getArgumentDefaultValue(ConsoleArgumentDefinition $argument): string
+    {
+        return match (true) {
+            $argument->default === true => 'true',
+            $argument->default === false => 'false',
+            is_null($argument->default) => 'null',
+            is_array($argument->default) => 'array',
+            $argument->default instanceof BackedEnum => $argument->default->value,
+            default => "{$argument->default}",
+        };
+    }
 }

tests/Integration/Console/Fixtures/MyConsole.php

@@ -13,8 +13,10 @@ public function handle(
         string $path,
         TestStringEnum $type,
         TestStringEnum $fallback = TestStringEnum::A,
+        ?TestStringEnum $nullableEnum = null,
         int $times = 1,
         bool $force = false,
+        ?string $optional = null,
     ): void {
     }
 }

tests/Integration/Console/RenderConsoleCommandTest.php

@@ -23,31 +23,61 @@
  */
 final class RenderConsoleCommandTest extends FrameworkIntegrationTestCase
 {
-    public function test_render(): void
-    {
-        $handler = new MethodReflector(new ReflectionMethod(new MyConsole(), 'handle'));
+    private GenericConsole $testConsole;
 
-        $consoleCommand = $handler->getAttributes(ConsoleCommand::class)[0];
+    private MemoryOutputBuffer $consoleOutput;
 
-        $consoleCommand->setHandler($handler);
+    protected function setUp(): void
+    {
+        parent::setUp();
 
-        $output = new MemoryOutputBuffer();
+        $this->consoleOutput = new MemoryOutputBuffer();
 
         $highlighter = new Highlighter(new TextTerminalTheme());
 
-        $console = new GenericConsole(
-            output: $output,
+        $this->testConsole = new GenericConsole(
+            output: $this->consoleOutput,
             input: new UnsupportedInputBuffer(),
             highlighter: $highlighter,
             executeConsoleCommand: $this->container->get(ExecuteConsoleCommand::class),
             argumentBag: $this->container->get(ConsoleArgumentBag::class),
         );
+    }
+
+    public function test_render(): void
+    {
+        $handler = new MethodReflector(new ReflectionMethod(new MyConsole(), 'handle'));
+
+        $consoleCommand = $handler->getAttributes(ConsoleCommand::class)[0];
+
+        $consoleCommand->setHandler($handler);
 
-        (new RenderConsoleCommand($console))($consoleCommand);
+        (new RenderConsoleCommand($this->testConsole))($consoleCommand);
 
         $this->assertSame(
             'test description',
-            trim($output->getBufferWithoutFormatting()[0]),
+            trim($this->consoleOutput->getBufferWithoutFormatting()[0]),
+        );
+    }
+
+    public function test_render_arguments(): void
+    {
+        $handler = new MethodReflector(new ReflectionMethod(new MyConsole(), 'handle'));
+
+        $consoleCommand = $handler->getAttributes(ConsoleCommand::class)[0];
+
+        $consoleCommand->setHandler($handler);
+
+        $renderConsoleCommand = new RenderConsoleCommand(
+            console: $this->testConsole,
+            renderArguments: true,
+        );
+
+        $renderConsoleCommand($consoleCommand);
+
+        $this->assertSame(
+            'test <path> <type {a|b|c}> [fallback=a {a|b|c}] [nullable-enum=null {a|b|c}] [times=1] [--force=false] [optional=null] description',
+            trim($this->consoleOutput->getBufferWithoutFormatting()[0]),
         );
     }
 }