diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-07-20 05:55:46 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-07-20 05:55:46 +0900 |
| commit | 7f14217abbba2f89ae5845d63c8f97b606354f45 (patch) | |
| tree | a000f7297f8aff509b74ce25ff871b334bcfc191 /crates/shirabe/src/io/io_interface.rs | |
| parent | b151ceaa798a7d2e9b55ffbc4e4b10ea8f0a59a8 (diff) | |
| download | php-shirabe-7f14217abbba2f89ae5845d63c8f97b606354f45.tar.gz php-shirabe-7f14217abbba2f89ae5845d63c8f97b606354f45.tar.zst php-shirabe-7f14217abbba2f89ae5845d63c8f97b606354f45.zip | |
fix(io): widen IOInterface::select choices to PhpMixed for assoc arrays
PHP's IOInterface::select accepts an associative choices array whose keys
are the selectable values, but the port narrowed it to Vec<String>, making
key-based selection unrepresentable. Accept PhpMixed (List or Array) like
PHP's array $choices; ConsoleIO already branched on both shapes internally.
Also mirror PHP in the single-select array_search fallback for numeric-keyed
arrays. All call sites keep their previous list-based behavior.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/io/io_interface.rs')
| -rw-r--r-- | crates/shirabe/src/io/io_interface.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/crates/shirabe/src/io/io_interface.rs b/crates/shirabe/src/io/io_interface.rs index 96bc1980..33a2f017 100644 --- a/crates/shirabe/src/io/io_interface.rs +++ b/crates/shirabe/src/io/io_interface.rs @@ -106,10 +106,13 @@ pub trait IOInterfaceImmutable: std::fmt::Debug { fn ask_and_hide_answer(&self, question: String) -> Option<String>; + /// PHP `array $choices` may be a list (`PhpMixed::List`) or an associative + /// array (`PhpMixed::Array`); list choices resolve to their index, while + /// associative choices resolve to their key. fn select( &self, question: String, - choices: Vec<String>, + choices: PhpMixed, default: PhpMixed, attempts: PhpMixed, error_message: String, @@ -301,7 +304,7 @@ impl IOInterfaceImmutable for std::rc::Rc<std::cell::RefCell<dyn IOInterface>> { fn select( &self, question: String, - choices: Vec<String>, + choices: PhpMixed, default: PhpMixed, attempts: PhpMixed, error_message: String, |