Merge pull request #3054 from tarlepp/buf/fix-mode-option

Bug: Fixed mode option from user/group console commands

Author: tarlepp

src/Command/ApiKey/CreateApiKeyCommand.php

@@ -27,6 +27,8 @@
 use Throwable;
 
 /**
+ * @psalm-import-type TInputOption from HelperConfigure
+ *
  * @package App\Command\ApiKey
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  */
@@ -42,7 +44,7 @@ class CreateApiKeyCommand extends Command
     final public const string NAME = 'api-key:create';
 
     /**
-     * @var array<int, array<string, string>>
+     * @var list<TInputOption>
      */
     private static array $commandParameters = [
         [

src/Command/HelperConfigure.php

@@ -10,39 +10,50 @@
 
 use Closure;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Completion\CompletionInput;
+use Symfony\Component\Console\Completion\CompletionSuggestions;
+use Symfony\Component\Console\Completion\Suggestion;
 use Symfony\Component\Console\Input\InputDefinition;
 use Symfony\Component\Console\Input\InputOption;
-use function array_key_exists;
 use function array_map;
 
 /**
+ * @psalm-type TInputOption=array{
+ *      name: string,
+ *      shortcut?: string,
+ *      mode?: int-mask-of<InputOption::*>,
+ *      description?: string,
+ *      default?: scalar|array<array-key, mixed>,
+ *      suggestedValues?: array<array-key, mixed>
+ *           |Closure(CompletionInput,CompletionSuggestions):list<string|Suggestion>,
+ *  }
+ *
  * @package App\Command
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  */
 class HelperConfigure
 {
     /**
-     * @param array<int, array<string, int|string>> $parameters
+     * @param list<TInputOption> $parameters
      */
     public static function configure(Command $command, array $parameters): void
     {
         // Configure command
         $command->setDefinition(new InputDefinition(array_map(self::getParameterIterator(), $parameters)));
     }
 
+    /**
+     * @return Closure(TInputOption):InputOption
+     */
     private static function getParameterIterator(): Closure
     {
-        return static function (array $input): InputOption {
-            /** @var int-mask-of<InputOption::*>|null $mode */
-            $mode = $input['mode'];
-
-            return new InputOption(
-                (string)$input['name'],
-                array_key_exists('shortcut', $input) ? (string)$input['shortcut'] : null,
-                array_key_exists('mode', $input) ? $mode : InputOption::VALUE_OPTIONAL,
-                array_key_exists('description', $input) ? (string)$input['description'] : '',
-                array_key_exists('default', $input) ? (string)$input['default'] : null,
-            );
-        };
+        return static fn (array $input): InputOption => new InputOption(
+            $input['name'],
+            $input['shortcut'] ?? null,
+            $input['mode'] ?? InputOption::VALUE_OPTIONAL,
+            $input['description'] ?? '',
+            $input['default'] ?? null,
+            $input['suggestedValues'] ?? [],
+        );
     }
 }

src/Command/User/CreateUserCommand.php

@@ -27,6 +27,8 @@
 use Throwable;
 
 /**
+ * @psalm-import-type TInputOption from HelperConfigure
+ *
  * @package App\Command\User
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  */
@@ -45,7 +47,7 @@ class CreateUserCommand extends Command
     private const string PARAMETER_DESCRIPTION = 'description';
 
     /**
-     * @var array<int, array<string, string>>
+     * @var list<TInputOption>
      */
     private static array $commandParameters = [
         [

src/Command/User/CreateUserGroupCommand.php

@@ -26,6 +26,8 @@
 use Throwable;
 
 /**
+ * @psalm-import-type TInputOption from HelperConfigure
+ *
  * @package App\Command\User
  * @author TLe, Tarmo Leppänen <tarmo.leppanen@pinja.com>
  */
@@ -41,7 +43,7 @@ class CreateUserGroupCommand extends Command
     final public const string NAME = 'user:create-group';
 
     /**
-     * @var array<int, array<string, string>>
+     * @var list<TInputOption>
      */
     private static array $commandParameters = [
         [