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/command/fund_command_test.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/tests/command/fund_command_test.rs') diff --git a/crates/shirabe/tests/command/fund_command_test.rs b/crates/shirabe/tests/command/fund_command_test.rs index faeda9dc..e1921f4e 100644 --- a/crates/shirabe/tests/command/fund_command_test.rs +++ b/crates/shirabe/tests/command/fund_command_test.rs @@ -8,6 +8,8 @@ use indexmap::IndexMap; use serial_test::serial; use shirabe::package::handle::{CompletePackageHandle, PackageInterfaceHandle}; use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputValue; +use shirabe_symfony_console::input::ParameterName; fn funding_entry(r#type: &str, url: &str) -> IndexMap { let mut m = IndexMap::new(); @@ -19,7 +21,7 @@ fn funding_entry(r#type: &str, url: &str) -> IndexMap { /// Runs one `useCaseProvider` case. fn run_fund_case( composer_json: serde_json::Value, - command: &[(&str, PhpMixed)], + command: &[(&str, InputValue)], funding: &[(&str, IndexMap)], expected: &str, ) { @@ -48,10 +50,10 @@ fn run_fund_case( create_installed_json(&packages, &dev_packages, true); - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from("fund"))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from("fund"))]; for (k, v) in command { - input.push((PhpMixed::from(*k), v.clone())); + input.push((ParameterName::of(k), v.clone())); } let mut app_tester = get_application_tester(); @@ -163,7 +165,7 @@ Thank you!", "require": { "first/pkg": "^2.0" }, "require-dev": { "dev/pkg": "~4.0" }, }), - &[("--format", PhpMixed::from("json"))], + &[("--format", InputValue::from("json"))], &[ ( "first/pkg", -- cgit v1.3.1-4-g156e