From 0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 19 Aug 2026 23:45:37 +0900 Subject: fix(input): thread a typed InputValue through the input layer Options and arguments were stored and passed as PhpMixed even though Symfony only ever puts a string, a bool, a list of strings or null in one. get_option already narrowed to InputOptionValue at the boundary; this widens that enum into InputValue and pushes it through InputInterface, InputOption/InputArgument defaults, the Input storage, ArgvInput/ArrayInput/StringInput/CompletionInput, Command::add_option and add_argument, and the Composer-side wrappers. Two neighbouring string|int unions get types of their own: InputDefinition::{get_argument,has_argument} take an ArgumentName, and ArrayInput keys its parameters by ParameterName. has_parameter_option and get_parameter_option take the values they look for as &[&str], which is what PHP's `(array) $values` cast produced anyway. Two behaviours change along the way. Input::set_option on a negated option now negates with PHP's loose bool cast rather than treating a non-bool as false, matching `!$value`. ArrayInput::parse now resolves an integer key to an argument position instead of looking up an argument literally named "0". Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/tests/application_test.rs | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/tests/application_test.rs') diff --git a/crates/shirabe/tests/application_test.rs b/crates/shirabe/tests/application_test.rs index 23bc909a..1d5f60eb 100644 --- a/crates/shirabe/tests/application_test.rs +++ b/crates/shirabe/tests/application_test.rs @@ -6,13 +6,15 @@ mod bootstrap; mod test_case; use serial_test::serial; +use shirabe_symfony_console::input::InputValue; +use shirabe_symfony_console::input::ParameterName; use test_case::init_temp_composer; use shirabe::command::about_command::AboutCommand; use shirabe::command::self_update_command::SelfUpdateCommand; use shirabe::console::application::ApplicationHandle; use shirabe::util::platform::Platform; -use shirabe_php_shim::{PHP_EOL, PHP_SERVER, PhpMixed, time}; +use shirabe_php_shim::{PHP_EOL, PHP_SERVER, time}; use shirabe_symfony_console::command::Command; use shirabe_symfony_console::input::ArrayInput; use shirabe_symfony_console::input::InputInterface; @@ -50,7 +52,7 @@ fn test_dev_warning() { let input: std::rc::Rc> = std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( - vec![(PhpMixed::from("command"), PhpMixed::from("about"))], + vec![(ParameterName::of("command"), InputValue::from("about"))], None, ) .unwrap(), @@ -93,7 +95,10 @@ fn test_dev_warning_suppressed_for_self_update() { let input: std::rc::Rc> = std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( - vec![(PhpMixed::from("command"), PhpMixed::from("self-update"))], + vec![( + ParameterName::of("command"), + InputValue::from("self-update"), + )], None, ) .unwrap(), @@ -121,7 +126,7 @@ fn test_process_isolation_works_multiple_times() { let input1: std::rc::Rc> = std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( - vec![(PhpMixed::from("command"), PhpMixed::from("about"))], + vec![(ParameterName::of("command"), InputValue::from("about"))], None, ) .unwrap(), @@ -134,7 +139,7 @@ fn test_process_isolation_works_multiple_times() { let input2: std::rc::Rc> = std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( - vec![(PhpMixed::from("command"), PhpMixed::from("about"))], + vec![(ParameterName::of("command"), InputValue::from("about"))], None, ) .unwrap(), @@ -175,8 +180,8 @@ fn test_no_plugins_disables_plugins_when_script_commands_exist() { std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( vec![ - (PhpMixed::from("command"), PhpMixed::from("list")), - (PhpMixed::from("--no-plugins"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("list")), + (ParameterName::of("--no-plugins"), InputValue::from(true)), ], None, ) @@ -240,7 +245,7 @@ fn test_script_command_takes_priority_over_abbreviated_builtin_command() { let input: std::rc::Rc> = std::rc::Rc::new(std::cell::RefCell::new( ArrayInput::new( - vec![(PhpMixed::from("command"), PhpMixed::from("check"))], + vec![(ParameterName::of("command"), InputValue::from("check"))], None, ) .unwrap(), -- cgit v1.3.1-4-g156e