diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-19 23:45:37 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-19 23:45:37 +0900 |
| commit | 0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc (patch) | |
| tree | ba5602549ce20b8d71136423e85dffc25deafff4 /crates/shirabe/tests/command/base_dependency_command_test.rs | |
| parent | 6ed3a85dd636366d194c9810fd777db7f25e263f (diff) | |
| download | php-shirabe-0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc.tar.gz php-shirabe-0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc.tar.zst php-shirabe-0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc.zip | |
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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/tests/command/base_dependency_command_test.rs')
| -rw-r--r-- | crates/shirabe/tests/command/base_dependency_command_test.rs | 116 |
1 files changed, 66 insertions, 50 deletions
diff --git a/crates/shirabe/tests/command/base_dependency_command_test.rs b/crates/shirabe/tests/command/base_dependency_command_test.rs index ace43ae7..41aeec56 100644 --- a/crates/shirabe/tests/command/base_dependency_command_test.rs +++ b/crates/shirabe/tests/command/base_dependency_command_test.rs @@ -7,8 +7,9 @@ use crate::test_case::{ use serial_test::serial; use shirabe::package::Link; use shirabe::package::handle::PackageInterfaceHandle; -use shirabe_php_shim::PhpMixed; use shirabe_semver::constraint::{AnyConstraint, MatchAllConstraint, MultiConstraint}; +use shirabe_symfony_console::input::InputValue; +use shirabe_symfony_console::input::ParameterName; /// ref: TestCase::trimLines — strip trailing spaces from each line, then trim the whole string. fn trim_lines(s: &str) -> String { @@ -29,7 +30,7 @@ fn match_all() -> AnyConstraint { #[serial] fn test_exception_when_no_required_parameters() { // noParametersCaseProvider - let cases: Vec<(&str, Vec<(&str, PhpMixed)>, &str)> = vec![ + let cases: Vec<(&str, Vec<(&str, InputValue)>, &str)> = vec![ ( "why", vec![], @@ -42,21 +43,21 @@ fn test_exception_when_no_required_parameters() { ), ( "why-not", - vec![("version", PhpMixed::from("*"))], + vec![("version", InputValue::from("*"))], "Not enough arguments (missing: \"package\").", ), ( "why-not", - vec![("package", PhpMixed::from("vendor1/package1"))], + vec![("package", InputValue::from("vendor1/package1"))], "Not enough arguments (missing: \"version\").", ), ]; for (command, parameters, expected_message) in cases { - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from(command))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from(command))]; for (k, v) in parameters { - input.push((PhpMixed::from(k), v)); + input.push((ParameterName::of(k), v)); } let mut app_tester = get_application_tester(); @@ -77,13 +78,16 @@ fn test_exception_when_no_required_parameters() { #[serial] fn test_exception_when_running_locked_without_lock_file() { // caseProvider - let cases: Vec<(&str, Vec<(&str, PhpMixed)>)> = vec![ - ("why", vec![("package", PhpMixed::from("vendor1/package1"))]), + let cases: Vec<(&str, Vec<(&str, InputValue)>)> = vec![ + ( + "why", + vec![("package", InputValue::from("vendor1/package1"))], + ), ( "why-not", vec![ - ("package", PhpMixed::from("vendor1/package1")), - ("version", PhpMixed::from("1.*")), + ("package", InputValue::from("vendor1/package1")), + ("version", InputValue::from("1.*")), ], ), ]; @@ -91,12 +95,12 @@ fn test_exception_when_running_locked_without_lock_file() { for (command, parameters) in cases { let tear_down = init_temp_composer(None, None, None, true); - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from(command))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from(command))]; for (k, v) in parameters { - input.push((PhpMixed::from(k), v)); + input.push((ParameterName::of(k), v)); } - input.push((PhpMixed::from("--locked"), PhpMixed::from(true))); + input.push((ParameterName::of("--locked"), InputValue::from(true))); let mut app_tester = get_application_tester(); let err = app_tester @@ -119,13 +123,16 @@ fn test_exception_when_running_locked_without_lock_file() { #[serial] fn test_exception_when_it_could_not_found_the_package() { // caseProvider - let cases: Vec<(&str, Vec<(&str, PhpMixed)>)> = vec![ - ("why", vec![("package", PhpMixed::from("vendor1/package1"))]), + let cases: Vec<(&str, Vec<(&str, InputValue)>)> = vec![ + ( + "why", + vec![("package", InputValue::from("vendor1/package1"))], + ), ( "why-not", vec![ - ("package", PhpMixed::from("vendor1/package1")), - ("version", PhpMixed::from("1.*")), + ("package", InputValue::from("vendor1/package1")), + ("version", InputValue::from("1.*")), ], ), ]; @@ -135,10 +142,10 @@ fn test_exception_when_it_could_not_found_the_package() { let tear_down = init_temp_composer(None, None, None, true); - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from(command))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from(command))]; for (k, v) in parameters { - input.push((PhpMixed::from(k), v)); + input.push((ParameterName::of(k), v)); } let mut app_tester = get_application_tester(); @@ -165,13 +172,16 @@ fn test_exception_when_it_could_not_found_the_package() { #[serial] fn test_exception_when_package_was_not_found_in_project() { // caseProvider - let cases: Vec<(&str, Vec<(&str, PhpMixed)>)> = vec![ - ("why", vec![("package", PhpMixed::from("vendor1/package1"))]), + let cases: Vec<(&str, Vec<(&str, InputValue)>)> = vec![ + ( + "why", + vec![("package", InputValue::from("vendor1/package1"))], + ), ( "why-not", vec![ - ("package", PhpMixed::from("vendor1/package1")), - ("version", PhpMixed::from("1.*")), + ("package", InputValue::from("vendor1/package1")), + ("version", InputValue::from("1.*")), ], ), ]; @@ -201,10 +211,10 @@ fn test_exception_when_package_was_not_found_in_project() { create_installed_json(&packages, &[], false); create_composer_lock(&packages, &[]); - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from(command))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from(command))]; for (k, v) in parameters { - input.push((PhpMixed::from(k), v)); + input.push((ParameterName::of(k), v)); } let mut app_tester = get_application_tester(); @@ -233,13 +243,16 @@ fn test_warning_when_dependencies_are_not_installed() { let expected_warning_message = "<warning>No dependencies installed. Try running composer install or update, or use --locked.</warning>"; // caseProvider - let cases: Vec<(&str, Vec<(&str, PhpMixed)>)> = vec![ - ("why", vec![("package", PhpMixed::from("vendor1/package1"))]), + let cases: Vec<(&str, Vec<(&str, InputValue)>)> = vec![ + ( + "why", + vec![("package", InputValue::from("vendor1/package1"))], + ), ( "why-not", vec![ - ("package", PhpMixed::from("vendor1/package1")), - ("version", PhpMixed::from("1.*")), + ("package", InputValue::from("vendor1/package1")), + ("version", InputValue::from("1.*")), ], ), ]; @@ -267,10 +280,10 @@ fn test_warning_when_dependencies_are_not_installed() { std::slice::from_ref(&some_dev_required_package), ); - let mut input: Vec<(PhpMixed, PhpMixed)> = - vec![(PhpMixed::from("command"), PhpMixed::from(command))]; + let mut input: Vec<(ParameterName, InputValue)> = + vec![(ParameterName::of("command"), InputValue::from(command))]; for (k, v) in parameters { - input.push((PhpMixed::from(k), v)); + input.push((ParameterName::of(k), v)); } let mut app_tester = get_application_tester(); @@ -415,18 +428,21 @@ fn test_why_command_outputs() { true, ); - let input: Vec<(PhpMixed, PhpMixed)> = vec![ - (PhpMixed::from("command"), PhpMixed::from("why")), + let input: Vec<(ParameterName, InputValue)> = vec![ + (ParameterName::of("command"), InputValue::from("why")), + ( + ParameterName::of("package"), + InputValue::from(package_to_be_inspected), + ), ( - PhpMixed::from("package"), - PhpMixed::from(package_to_be_inspected), + ParameterName::of("--tree"), + InputValue::from(render_as_tree), ), - (PhpMixed::from("--tree"), PhpMixed::from(render_as_tree)), ( - PhpMixed::from("--recursive"), - PhpMixed::from(render_recursively), + ParameterName::of("--recursive"), + InputValue::from(render_recursively), ), - (PhpMixed::from("--locked"), PhpMixed::from(true)), + (ParameterName::of("--locked"), InputValue::from(true)), ]; let mut app_tester = get_application_tester(); @@ -586,15 +602,15 @@ fn test_why_not_command_outputs() { true, ); - let input: Vec<(PhpMixed, PhpMixed)> = vec![ - (PhpMixed::from("command"), PhpMixed::from("why-not")), + let input: Vec<(ParameterName, InputValue)> = vec![ + (ParameterName::of("command"), InputValue::from("why-not")), ( - PhpMixed::from("package"), - PhpMixed::from(package_to_be_inspected), + ParameterName::of("package"), + InputValue::from(package_to_be_inspected), ), ( - PhpMixed::from("version"), - PhpMixed::from(package_version_to_be_inspected), + ParameterName::of("version"), + InputValue::from(package_version_to_be_inspected), ), ]; |
