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) --- .../tests/command/reinstall_command_test.rs | 27 +++++++++------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/tests/command/reinstall_command_test.rs') diff --git a/crates/shirabe/tests/command/reinstall_command_test.rs b/crates/shirabe/tests/command/reinstall_command_test.rs index ecd98c37..6847d998 100644 --- a/crates/shirabe/tests/command/reinstall_command_test.rs +++ b/crates/shirabe/tests/command/reinstall_command_test.rs @@ -5,26 +5,24 @@ use crate::test_case::{ init_temp_composer, }; use serial_test::serial; -use shirabe_php_shim::PhpMixed; +use shirabe_symfony_console::input::InputValue; +use shirabe_symfony_console::input::ParameterName; -fn input(pairs: Vec<(&str, PhpMixed)>) -> Vec<(PhpMixed, PhpMixed)> { +fn input(pairs: Vec<(&str, InputValue)>) -> Vec<(ParameterName, InputValue)> { pairs .into_iter() - .map(|(k, v)| (PhpMixed::from(k), v)) + .map(|(k, v)| (ParameterName::of(k), v)) .collect() } /// ref: ReinstallCommandTest::caseProvider -fn cases() -> Vec<(&'static str, Vec<(&'static str, PhpMixed)>, &'static str)> { +fn cases() -> Vec<(&'static str, Vec<(&'static str, InputValue)>, &'static str)> { vec![ ( "reinstall a package by name", vec![( "packages", - PhpMixed::List(vec![ - PhpMixed::from("root/req"), - PhpMixed::from("root/anotherreq*"), - ]), + InputValue::Array(vec!["root/req".to_string(), "root/anotherreq*".to_string()]), )], "- Removing root/req (1.0.0) - Removing root/anotherreq2 (1.0.0) @@ -35,10 +33,7 @@ fn cases() -> Vec<(&'static str, Vec<(&'static str, PhpMixed)>, &'static str)> { ), ( "reinstall packages by type", - vec![( - "--type", - PhpMixed::List(vec![PhpMixed::from("metapackage")]), - )], + vec![("--type", InputValue::Array(vec!["metapackage".to_string()]))], "- Removing root/req (1.0.0) - Removing root/lala (1.0.0) - Removing root/anotherreq2 (1.0.0) @@ -52,7 +47,7 @@ fn cases() -> Vec<(&'static str, Vec<(&'static str, PhpMixed)>, &'static str)> { "reinstall a package that is not installed", vec![( "packages", - PhpMixed::List(vec![PhpMixed::from("root/unknownreq")]), + InputValue::Array(vec!["root/unknownreq".to_string()]), )], r#"Pattern "root/unknownreq" does not match any currently installed packages. Found no packages to reinstall, aborting."#, @@ -93,9 +88,9 @@ fn test_reinstall_command() { let mut app_tester = get_application_tester(); let mut args = vec![ - ("command", PhpMixed::from("reinstall")), - ("--no-progress", PhpMixed::from(true)), - ("--no-plugins", PhpMixed::from(true)), + ("command", InputValue::from("reinstall")), + ("--no-progress", InputValue::from(true)), + ("--no-plugins", InputValue::from(true)), ]; args.extend(options); app_tester.run(input(args), RunOptions::default()).unwrap(); -- cgit v1.3.1-4-g156e