aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/installer_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/installer_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/installer_test.rs')
-rw-r--r--crates/shirabe/tests/installer_test.rs37
1 files changed, 17 insertions, 20 deletions
diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs
index 4d24186f..6907758c 100644
--- a/crates/shirabe/tests/installer_test.rs
+++ b/crates/shirabe/tests/installer_test.rs
@@ -9,6 +9,7 @@ mod test_case;
use config_stub::ConfigStubBuilder;
use serial_test::serial;
+use shirabe_symfony_console::input::InputValue;
use test_case::{get_package, get_version_constraint};
use indexmap::IndexMap;
@@ -52,7 +53,6 @@ use shirabe_symfony_console::command::CommandData;
use shirabe_symfony_console::input::InputArgument;
use shirabe_symfony_console::input::InputInterface;
use shirabe_symfony_console::input::InputOption;
-use shirabe_symfony_console::input::InputOptionValue;
use shirabe_symfony_console::input::StringInput;
use shirabe_symfony_console::output::StreamOutput;
use shirabe_symfony_console::output::{OutputInterface, VERBOSITY_NORMAL};
@@ -829,9 +829,9 @@ fn ignore_platform_reqs_value(input: &dyn InputInterface) -> PhpMixed {
}
let list = input
.get_option("ignore-platform-req")
- .unwrap_or(InputOptionValue::Bool(false));
+ .unwrap_or(InputValue::Bool(false));
match &list {
- InputOptionValue::Array(items) if !items.is_empty() => list.into(),
+ InputValue::Array(items) if !items.is_empty() => list.into(),
_ => PhpMixed::Bool(false),
}
}
@@ -970,37 +970,37 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
install_ref
.add_option(
"ignore-platform-reqs",
- PhpMixed::Null,
+ None,
Some(InputOption::VALUE_NONE),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
install_ref
.add_option(
"ignore-platform-req",
- PhpMixed::Null,
+ None,
Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
install_ref
.add_option(
"no-dev",
- PhpMixed::Null,
+ None,
Some(InputOption::VALUE_NONE),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
install_ref
.add_option(
"dry-run",
- PhpMixed::Null,
+ None,
Some(InputOption::VALUE_NONE),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
let installer_cl = installer.clone();
@@ -1053,16 +1053,16 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
("prefer-lowest", InputOption::VALUE_NONE),
] {
update_ref
- .add_option(name, PhpMixed::Null, Some(mode), "", PhpMixed::Null)
+ .add_option(name, None, Some(mode), "", InputValue::Null)
.unwrap();
}
update_ref
.add_option(
"ignore-platform-req",
- PhpMixed::Null,
+ None,
Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
update_ref
@@ -1070,7 +1070,7 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
"packages",
Some(InputArgument::IS_ARRAY | InputArgument::OPTIONAL),
"",
- PhpMixed::Null,
+ InputValue::Null,
)
.unwrap();
let installer_cl = installer;
@@ -1078,11 +1078,8 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
let run_result_cl = run_result.clone();
update_ref.set_code(Box::new(move |input, _output| {
let packages: Vec<String> =
- match input.get_argument("packages").unwrap_or(PhpMixed::Null) {
- PhpMixed::List(items) => items
- .into_iter()
- .filter_map(|v| v.as_string().map(|s| s.to_string()))
- .collect(),
+ match input.get_argument("packages").unwrap_or(InputValue::Null) {
+ InputValue::Array(items) => items,
_ => vec![],
};
let filtered: Vec<String> = packages