From 7f14217abbba2f89ae5845d63c8f97b606354f45 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 20 Jul 2026 05:55:46 +0900 Subject: 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, 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 --- crates/shirabe/src/io/io_interface.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/src/io/io_interface.rs') 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; + /// 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, + choices: PhpMixed, default: PhpMixed, attempts: PhpMixed, error_message: String, @@ -301,7 +304,7 @@ impl IOInterfaceImmutable for std::rc::Rc> { fn select( &self, question: String, - choices: Vec, + choices: PhpMixed, default: PhpMixed, attempts: PhpMixed, error_message: String, -- cgit v1.3.1