aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/command/suggests_command_test.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-19 23:45:37 +0900
committernsfisis <nsfisis@gmail.com>2026-08-19 23:45:37 +0900
commit0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc (patch)
treeba5602549ce20b8d71136423e85dffc25deafff4 /crates/shirabe/tests/command/suggests_command_test.rs
parent6ed3a85dd636366d194c9810fd777db7f25e263f (diff)
downloadphp-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/suggests_command_test.rs')
-rw-r--r--crates/shirabe/tests/command/suggests_command_test.rs19
1 files changed, 10 insertions, 9 deletions
diff --git a/crates/shirabe/tests/command/suggests_command_test.rs b/crates/shirabe/tests/command/suggests_command_test.rs
index dd793c40..6236e3f9 100644
--- a/crates/shirabe/tests/command/suggests_command_test.rs
+++ b/crates/shirabe/tests/command/suggests_command_test.rs
@@ -8,7 +8,8 @@ use indexmap::IndexMap;
use serial_test::serial;
use shirabe::package::Link;
use shirabe::package::handle::{CompletePackageHandle, PackageInterfaceHandle};
-use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::input::InputValue;
+use shirabe_symfony_console::input::ParameterName;
/// ref: SuggestsCommandTest::getPackageWithSuggestAndRequires
fn get_package_with_suggest_and_requires(
@@ -82,7 +83,7 @@ fn test_installed_packages_with_no_suggestions() {
let mut app_tester = get_application_tester();
let status_code = app_tester
.run(
- vec![(PhpMixed::from("command"), PhpMixed::from("suggest"))],
+ vec![(ParameterName::of("command"), InputValue::from("suggest"))],
RunOptions::default(),
)
.unwrap();
@@ -171,7 +172,7 @@ fn suggest_packages() -> (Vec<PackageInterfaceHandle>, Vec<PackageInterfaceHandl
(packages, dev_packages)
}
-fn run_suggest_case(has_lock_file: bool, command: &[(&str, PhpMixed)], expected: &str) {
+fn run_suggest_case(has_lock_file: bool, command: &[(&str, InputValue)], expected: &str) {
let tear_down = init_temp_composer(
Some(&serde_json::json!({
"repositories": {
@@ -199,10 +200,10 @@ fn run_suggest_case(has_lock_file: bool, command: &[(&str, PhpMixed)], expected:
create_composer_lock(&packages, &dev_packages);
}
- let mut input: Vec<(PhpMixed, PhpMixed)> =
- vec![(PhpMixed::from("command"), PhpMixed::from("suggest"))];
+ let mut input: Vec<(ParameterName, InputValue)> =
+ vec![(ParameterName::of("command"), InputValue::from("suggest"))];
for (k, v) in command {
- input.push((PhpMixed::from(*k), v.clone()));
+ input.push((ParameterName::of(k), v.clone()));
}
let mut app_tester = get_application_tester();
@@ -216,7 +217,7 @@ fn run_suggest_case(has_lock_file: bool, command: &[(&str, PhpMixed)], expected:
#[test]
#[serial]
fn test_suggest() {
- let t = PhpMixed::from(true);
+ let t = InputValue::from(true);
let by_package = ("--by-package", t.clone());
let by_suggestion = ("--by-suggestion", t.clone());
let no_dev = ("--no-dev", t.clone());
@@ -359,7 +360,7 @@ vendor3/suggested is suggested by:
true,
&[(
"packages",
- PhpMixed::List(vec![PhpMixed::from("vendor2/package2")]),
+ InputValue::Array(vec!["vendor2/package2".to_string()]),
)],
for_pkg,
);
@@ -367,7 +368,7 @@ vendor3/suggested is suggested by:
false,
&[(
"packages",
- PhpMixed::List(vec![PhpMixed::from("vendor2/package2")]),
+ InputValue::Array(vec!["vendor2/package2".to_string()]),
)],
for_pkg,
);