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) --- .../shirabe/tests/command/licenses_command_test.rs | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'crates/shirabe/tests/command/licenses_command_test.rs') diff --git a/crates/shirabe/tests/command/licenses_command_test.rs b/crates/shirabe/tests/command/licenses_command_test.rs index 5b25aadd..b226f2f0 100644 --- a/crates/shirabe/tests/command/licenses_command_test.rs +++ b/crates/shirabe/tests/command/licenses_command_test.rs @@ -6,7 +6,8 @@ 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: LicensesCommandTest::setUp fn set_up() -> TearDown { @@ -85,7 +86,7 @@ fn test_basic_run() { let mut app_tester = get_application_tester(); let status_code = app_tester .run( - vec![(PhpMixed::from("command"), PhpMixed::from("license"))], + vec![(ParameterName::of("command"), InputValue::from("license"))], RunOptions::default(), ) .unwrap(); @@ -115,8 +116,8 @@ fn test_no_dev() { let status_code = app_tester .run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--no-dev"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--no-dev"), InputValue::from(true)), ], RunOptions::default(), ) @@ -146,8 +147,8 @@ fn test_format_json() { let status_code = app_tester .run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--format"), PhpMixed::from("json")), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--format"), InputValue::from("json")), ], RunOptions { capture_stderr_separately: true, @@ -182,8 +183,8 @@ fn test_format_summary() { let status_code = app_tester .run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--format"), PhpMixed::from("summary")), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--format"), InputValue::from("summary")), ], RunOptions::default(), ) @@ -223,8 +224,8 @@ fn test_format_unknown() { let mut app_tester = get_application_tester(); let result = app_tester.run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--format"), PhpMixed::from("unknown")), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--format"), InputValue::from("unknown")), ], RunOptions::default(), ); @@ -244,8 +245,8 @@ fn test_locked() { let status_code = app_tester .run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--locked"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--locked"), InputValue::from(true)), ], RunOptions::default(), ) @@ -276,9 +277,9 @@ fn test_locked_no_dev() { let status_code = app_tester .run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--locked"), PhpMixed::from(true)), - (PhpMixed::from("--no-dev"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--locked"), InputValue::from(true)), + (ParameterName::of("--no-dev"), InputValue::from(true)), ], RunOptions::default(), ) @@ -310,8 +311,8 @@ fn test_locked_without_lock_file() { let mut app_tester = get_application_tester(); let result = app_tester.run( vec![ - (PhpMixed::from("command"), PhpMixed::from("license")), - (PhpMixed::from("--locked"), PhpMixed::from(true)), + (ParameterName::of("command"), InputValue::from("license")), + (ParameterName::of("--locked"), InputValue::from(true)), ], RunOptions::default(), ); -- cgit v1.3.1-4-g156e