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/home_command_test.rs | 25 ++++++++++++----------- 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'crates/shirabe/tests/command/home_command_test.rs') diff --git a/crates/shirabe/tests/command/home_command_test.rs b/crates/shirabe/tests/command/home_command_test.rs index 4a77bd8a..17bfd191 100644 --- a/crates/shirabe/tests/command/home_command_test.rs +++ b/crates/shirabe/tests/command/home_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; /// ref: HomeCommandTest::testHomeCommandWithShowFlag fn run_use_case( composer_json: serde_json::Value, - command: Vec<(PhpMixed, PhpMixed)>, + command: Vec<(ParameterName, InputValue)>, expected: &str, urls: &[(&str, &str)], ) { @@ -36,8 +37,8 @@ fn run_use_case( let mut app_tester = get_application_tester(); let mut input = vec![ - (PhpMixed::from("command"), PhpMixed::from("home")), - (PhpMixed::from("--show"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("home")), + (ParameterName::of("--show"), InputValue::from(true)), ]; input.extend(command); app_tester.run(input, RunOptions::default()).unwrap(); @@ -64,8 +65,8 @@ fn test_home_command_with_show_flag_invalid_or_missing_repository_url() { }, }), vec![( - PhpMixed::from("packages"), - PhpMixed::List(vec![PhpMixed::from("vendor/package")]), + ParameterName::of("packages"), + InputValue::Array(vec!["vendor/package".to_string()]), )], "Invalid or missing repository URL for vendor/package", &[], @@ -92,8 +93,8 @@ fn test_home_command_with_show_flag_package_not_found() { run_use_case( serde_json::json!({ "repositories": [] }), vec![( - PhpMixed::from("packages"), - PhpMixed::List(vec![PhpMixed::from("vendor/anotherpackage")]), + ParameterName::of("packages"), + InputValue::Array(vec!["vendor/anotherpackage".to_string()]), )], "Package vendor/anotherpackage not found\n\ Invalid or missing repository URL for vendor/anotherpackage", @@ -108,8 +109,8 @@ fn test_home_command_with_show_flag_a_valid_package_url() { run_use_case( serde_json::json!({ "repositories": [] }), vec![( - PhpMixed::from("packages"), - PhpMixed::List(vec![PhpMixed::from("vendor/package")]), + ParameterName::of("packages"), + InputValue::Array(vec!["vendor/package".to_string()]), )], "https://example.org", &[("vendor/package", "https://example.org")], @@ -123,8 +124,8 @@ fn test_home_command_with_show_flag_a_valid_dev_package_url() { run_use_case( serde_json::json!({ "repositories": [] }), vec![( - PhpMixed::from("packages"), - PhpMixed::List(vec![PhpMixed::from("vendor/devpackage")]), + ParameterName::of("packages"), + InputValue::Array(vec!["vendor/devpackage".to_string()]), )], "https://example.org/dev", &[("vendor/devpackage", "https://example.org/dev")], -- cgit v1.3.1-4-g156e