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/status_command_test.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/tests/command/status_command_test.rs') diff --git a/crates/shirabe/tests/command/status_command_test.rs b/crates/shirabe/tests/command/status_command_test.rs index 32b8390a..a5571856 100644 --- a/crates/shirabe/tests/command/status_command_test.rs +++ b/crates/shirabe/tests/command/status_command_test.rs @@ -6,12 +6,13 @@ use crate::test_case::{ }; use serial_test::serial; use shirabe::package::handle::PackageInterfaceHandle; -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() } @@ -36,7 +37,7 @@ fn test_no_local_changes() { let mut app_tester = get_application_tester(); app_tester .run( - vec![(PhpMixed::from("command"), PhpMixed::from("status"))], + vec![(ParameterName::of("command"), InputValue::from("status"))], RunOptions::default(), ) .unwrap(); @@ -59,7 +60,7 @@ struct LocallyModifiedPackageData { /// ref: StatusCommandTest::testLocallyModifiedPackages (data provider rolled into a helper). fn run_locally_modified_packages_case( composer_json: serde_json::Value, - command_flags: Vec<(&str, PhpMixed)>, + command_flags: Vec<(&str, InputValue)>, package_data: LocallyModifiedPackageData, ) { let _tear_down = init_temp_composer(Some(&composer_json), None, None, true); @@ -84,7 +85,7 @@ fn run_locally_modified_packages_case( let mut app_tester = get_application_tester(); app_tester .run( - input(vec![("command", PhpMixed::from("install"))]), + input(vec![("command", InputValue::from("install"))]), RunOptions::default(), ) .unwrap(); @@ -99,7 +100,7 @@ fn run_locally_modified_packages_case( ) .unwrap(); - let mut status_input = vec![("command", PhpMixed::from("status"))]; + let mut status_input = vec![("command", InputValue::from("status"))]; status_input.extend(command_flags); app_tester .run(input(status_input), RunOptions::default()) @@ -135,7 +136,7 @@ fn test_locally_modified_packages_from_source() { fn test_locally_modified_packages_from_dist() { run_locally_modified_packages_case( serde_json::json!({ "require": { "smarty/smarty": "^3.1" } }), - vec![("--verbose", PhpMixed::from(true))], + vec![("--verbose", InputValue::from(true))], LocallyModifiedPackageData { name: "smarty/smarty", version: "3.1.7", -- cgit v1.3.1-4-g156e