Nicolas' review

yceruto · yceruto · commit e3c2c0dc2be3 · 2025-01-17T08:51:01.000-05:00
diff --git a/src/Symfony/Component/Console/Attribute/Argument.php b/src/Symfony/Component/Console/Attribute/Argument.php
@@ -23,23 +23,22 @@ class Argument
     private const ALLOWED_TYPES = ['string', 'bool', 'int', 'float', 'array'];
 
     private string|bool|int|float|array|null $default = null;
+    private array|\Closure $suggestedValues;
     private ?int $mode = null;
 
     /**
      * Represents a console command <argument> definition.
      *
      * If unset, the `name` value will be inferred from the parameter definition.
      *
-     * @param array<string|Suggestion>|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
+     * @param array<string|Suggestion>|callable(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
         public string $name = '',
         public string $description = '',
-        public array|string $suggestedValues = [],
+        array|callable $suggestedValues = [],
     ) {
-        if (\is_string($suggestedValues) && !\is_callable($suggestedValues)) {
-            throw new \TypeError(\sprintf('Argument 4 passed to "%s()" must be either an array or a callable-string.', __METHOD__));
-        }
+        $this->suggestedValues = \is_callable($suggestedValues) ? $suggestedValues(...) : $suggestedValues;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Attribute/Option.php b/src/Symfony/Component/Console/Attribute/Option.php
@@ -23,6 +23,7 @@ class Option
     private const ALLOWED_TYPES = ['string', 'bool', 'int', 'float', 'array'];
 
     private string|bool|int|float|array|null $default = null;
+    private array|\Closure $suggestedValues;
     private ?int $mode = null;
     private string $typeName = '';
     private bool $allowNull = false;
@@ -32,18 +33,16 @@ class Option
      *
      * If unset, the `name` value will be inferred from the parameter definition.
      *
-     * @param array|string|null                                                                 $shortcut        The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
-     * @param array<string|Suggestion>|callable-string(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
+     * @param array|string|null                                                          $shortcut        The shortcuts, can be null, a string of shortcuts delimited by | or an array of shortcuts
+     * @param array<string|Suggestion>|callable(CompletionInput):list<string|Suggestion> $suggestedValues The values used for input completion
      */
     public function __construct(
         public string $name = '',
         public array|string|null $shortcut = null,
         public string $description = '',
-        public array|string $suggestedValues = [],
+        array|callable $suggestedValues = [],
     ) {
-        if (\is_string($suggestedValues) && !\is_callable($suggestedValues)) {
-            throw new \TypeError(\sprintf('Argument 5 passed to "%s()" must be either an array or a callable-string.', __METHOD__));
-        }
+        $this->suggestedValues = \is_callable($suggestedValues) ? $suggestedValues(...) : $suggestedValues;
     }
 
     /**
diff --git a/src/Symfony/Component/Console/Command/InvokableCommand.php b/src/Symfony/Component/Console/Command/InvokableCommand.php
@@ -85,15 +85,17 @@ private function getClosure(callable $code): \Closure
             return $code(...);
         }
 
-        if (null === (new \ReflectionFunction($code))->getClosureThis()) {
-            set_error_handler(static function () {});
-            try {
-                if ($c = \Closure::bind($code, $this->command)) {
-                    $code = $c;
-                }
-            } finally {
-                restore_error_handler();
+        if (null !== (new \ReflectionFunction($code))->getClosureThis()) {
+            return $code;
+        }
+
+        set_error_handler(static function () {});
+        try {
+            if ($c = \Closure::bind($code, $this->command)) {
+                $code = $c;
             }
+        } finally {
+            restore_error_handler();
         }
 
         return $code;
