Update Console::ask

tempestphp · Apr 22, 2024 · a1e1b5e · a1e1b5e
1 parent bef2eaf
commit a1e1b5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 15 deletions.
diff --git a/app/Console/InteractiveCommand.php b/app/Console/InteractiveCommand.php
@@ -13,15 +13,13 @@
 
 final readonly class InteractiveCommand
 {
-    public function __construct(private Console $console)
-    {
-    }
+    public function __construct(private Console $console) {}
 
     #[ConsoleCommand('interactive:validation')]
     public function validation(): void
     {
-        $a = $this->console->ask('a', validation: [new Length(min: 2), new Length(max:2)]);
-        $b = $this->console->ask('b',  validation: [new Email()]);
+        $a = $this->console->ask('a', validation: [new Length(min: 2), new Length(max: 2)]);
+        $b = $this->console->ask('b', validation: [new Email()]);
 
         $this->console->success("$a $b");
     }
@@ -58,10 +56,12 @@ public function option(): void
     #[ConsoleCommand('interactive:multiple')]
     public function multiple(): void
     {
-        $result = $this->console->component(new MultipleChoiceComponent(
-            'Pick several',
-            ['a', 'b', 'c'],
-        ), validation: [new Count(min: 1)]);
+        $result = $this->console->ask(
+            question: 'Pick several',
+            options: ['a', 'b', 'c'],
+            multiple: true,
+            validation: [new Count(min: 1)],
+        );
 
         $result = json_encode($result);
 

diff --git a/src/Console.php b/src/Console.php
@@ -16,10 +16,12 @@ public function component(ConsoleComponent $component, array $validation = []):
 
     /**
      * @param string $question
-     * @param array $options
+     * @param array|null $options
+     * @param bool $multiple
      * @param \Tempest\Validation\Rule[] $validation
+     * @return string
      */
-    public function ask(string $question, ?array $options = null, array $validation = []): string;
+    public function ask(string $question, ?array $options = null, bool $multiple = false, array $validation = []): string|array;
 
     public function confirm(string $question, bool $default = false): bool;
 

diff --git a/src/GenericConsole.php b/src/GenericConsole.php
@@ -7,6 +7,7 @@
 use Closure;
 use Tempest\Console\Actions\RenderConsoleComponent;
 use Tempest\Console\Components\ConfirmComponent;
+use Tempest\Console\Components\MultipleChoiceComponent;
 use Tempest\Console\Components\PasswordComponent;
 use Tempest\Console\Components\ProgressBarComponent;
 use Tempest\Console\Components\QuestionComponent;
@@ -74,11 +75,15 @@ public function component(ConsoleComponent $component, array $validation = []):
         return (new RenderConsoleComponent($this))($component, $validation);
     }
 
-    public function ask(string $question, ?array $options = null, array $validation = []): string
+    public function ask(string $question, ?array $options = null, bool $multiple = false, array $validation = []): string|array
     {
-        $component = ($options === null || $options === [])
-            ? new TextBoxComponent($question)
-            : new QuestionComponent($question, $options);
+        if ($options === null || $options === []) {
+            $component = new TextBoxComponent($question);
+        } elseif ($multiple) {
+            $component = new MultipleChoiceComponent($question, $options);
+        } else {
+            $component = new QuestionComponent($question, $options);
+        }
 
         return $this->component($component, $validation);
     }