Bump laravel/prompts to v0.3.5 (#6246)

* Bump laravel/prompts to v0.3.5

See also https://github.com/laravel/prompts/releases/tag/v0.3.5

* Remove usage of Illuminate Collection

Author: jnoordsij

composer.json

@@ -46,7 +46,7 @@
     "dflydev/dot-access-data": "^3.0.2",
     "grasmash/yaml-cli": "^3.1",
     "guzzlehttp/guzzle": "^7.0",
-    "laravel/prompts": "^0.1.21",
+    "laravel/prompts": "^0.3.5",
     "league/container": "^4.2",
     "psy/psysh": "~0.12",
     "symfony/event-dispatcher": "^6 || ^7",

src-symfony-compatibility/v6/Style/DrushStyle.php

@@ -3,7 +3,6 @@
 namespace Drush\Style;
 
 use Drush\Drush;
-use Illuminate\Support\Collection;
 use JetBrains\PhpStorm\Deprecated;
 use Laravel\Prompts\MultiSearchPrompt;
 use Laravel\Prompts\MultiSelectPrompt;
@@ -76,40 +75,40 @@ public function password(\Stringable|string $label, \Stringable|string $placehol
     /**
      * Prompt the user to select an option.
      *
-     * @param  array<int|string, string>|Collection<int|string, string>  $options
+     * @param  array<int|string, string>  $options
      * @param  true|string  $required
      */
-    public function select(string $label, array|Collection $options, int|string|null $default = null, int $scroll = 10, ?\Closure $validate = null, string $hint = '', bool|string $required = true): int|string
+    public function select(string $label, array $options, int|string|null $default = null, int $scroll = 10, ?\Closure $validate = null, string $hint = '', bool|string $required = true): int|string
     {
         return (new SelectPrompt($label, $options, $default, $scroll, $validate, $hint, $required))->prompt();
     }
 
     /**
      * Prompt the user to select multiple options.
      *
-     * @param  array<int|string, string>|Collection<int|string, string>  $options
-     * @param  array<int|string>|Collection<int, int|string>  $default
+     * @param  array<int|string, string>  $options
+     * @param  array<int|string>  $default
      * @return array<int|string>
      */
-    public function multiselect(string $label, array|Collection $options, array|Collection $default = [], int $scroll = 10, bool|string $required = false, ?\Closure $validate = null, string $hint = 'Use the space bar to select options.'): array
+    public function multiselect(string $label, array $options, array $default = [], int $scroll = 10, bool|string $required = false, ?\Closure $validate = null, string $hint = 'Use the space bar to select options.'): array
     {
         return (new MultiSelectPrompt($label, $options, $default, $scroll, $required, $validate, $hint))->prompt();
     }
 
     /**
      * Prompt the user for text input with auto-completion.
      *
-     * @param  array<string>|Collection<int, string>|Closure(string): array<string>  $options
+     * @param  array<string>|\Closure(string): array<string>  $options
      */
-    public function suggest(string $label, array|Collection|\Closure $options, string $placeholder = '', string $default = '', int $scroll = 10, bool|string $required = false, ?\Closure $validate = null, string $hint = 'Start typing the first letter(s) and matching choices will be shown.'): string
+    public function suggest(string $label, array|\Closure $options, string $placeholder = '', string $default = '', int $scroll = 10, bool|string $required = false, ?\Closure $validate = null, string $hint = 'Start typing the first letter(s) and matching choices will be shown.'): string
     {
         return (new SuggestPrompt($label, $options, $placeholder, $default, $scroll, $required, $validate, $hint))->prompt();
     }
 
     /**
      * Allow the user to search for an option.
      *
-     * @param  Closure(string): array<int|string, string>  $options
+     * @param  \Closure(string): array<int|string, string>  $options
      * @param  true|string  $required
      */
     public function search(string $label, \Closure $options, string $placeholder = '', int $scroll = 10, ?\Closure $validate = null, string $hint = '', bool|string $required = true): int|string
@@ -120,7 +119,7 @@ public function search(string $label, \Closure $options, string $placeholder = '
     /**
      * Allow the user to search for multiple option.
      *
-     * @param  Closure(string): array<int|string, string>  $options
+     * @param  \Closure(string): array<int|string, string>  $options
      * @return array<int|string>
      */
     public function multisearch(string $label, \Closure $options, string $placeholder = '', int $scroll = 10, bool|string $required = false, ?\Closure $validate = null, string $hint = 'Use the space bar to select options.'): array
@@ -148,7 +147,7 @@ public function spin(\Closure $callback, string $message = ''): mixed
      * @template TReturn
      *
      * @param  TSteps  $steps
-     * @param  ?Closure((TSteps is int ? int : value-of<TSteps>), Progress<TSteps>): TReturn  $callback
+     * @param  ?\Closure((TSteps is int ? int : value-of<TSteps>), Progress<TSteps>): TReturn  $callback
      * @return ($callback is null ? Progress<TSteps> : array<TReturn>)
      */
     public function progress(string $label, iterable|int $steps, ?\Closure $callback = null, string $hint = ''): array|Progress

src/Commands/ConfiguresPrompts.php

@@ -83,9 +83,11 @@ protected function configurePrompts(InputInterface $input)
 
             return $this->promptUntilValid(
                 // MW: Had to change to 'none' as key to fix test failure. Deviates from Laravel.
-                fn () => collect($style->choice($prompt->label, ['none' => 'None', ...$prompt->options], 'none', true))
-                    ->reject('none')
-                    ->all(),
+                fn () => array_filter(
+                    $style->choice($prompt->label, ['none' => 'None', ...$prompt->options], 'none', true),
+                    fn ($option, $key) => $key !== 'none',
+                    ARRAY_FILTER_USE_BOTH,
+                ),
                 $prompt->required,
                 $prompt->validate
             );
@@ -118,16 +120,17 @@ function () use ($prompt) {
 
                 if ($prompt->required === false) {
                     if (array_is_list($options)) {
-                        return collect($style->choice($prompt->label, ['None', ...$options], 'None', true))
-                            ->reject('None')
-                            ->values()
-                            ->all();
+                        return array_filter(
+                            $style->choice($prompt->label, ['None', ...$options], 'None', true),
+                            fn ($option) => $option !== 'None',
+                        );
                     }
 
-                    return collect($style->choice($prompt->label, ['' => 'None', ...$options], '', true))
-                        ->reject('')
-                        ->values()
-                        ->all();
+                    return array_filter(
+                        $style->choice($prompt->label, ['' => 'None', ...$options], '', true),
+                        fn ($option, $key) => $key !== '',
+                        ARRAY_FILTER_USE_BOTH,
+                    );
                 }
 
                 return $style->choice($prompt->label, $options, true);