aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/command/validate_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/validate_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/validate_command_test.rs')
-rw-r--r--crates/shirabe/tests/command/validate_command_test.rs14
1 files changed, 9 insertions, 5 deletions
diff --git a/crates/shirabe/tests/command/validate_command_test.rs b/crates/shirabe/tests/command/validate_command_test.rs
index 67370df0..fb05b423 100644
--- a/crates/shirabe/tests/command/validate_command_test.rs
+++ b/crates/shirabe/tests/command/validate_command_test.rs
@@ -5,7 +5,8 @@ use crate::test_case::{
};
use serial_test::serial;
use shirabe::util::platform::Platform;
-use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::input::InputValue;
+use shirabe_symfony_console::input::ParameterName;
/// ref: ValidateCommandTest::MINIMAL_VALID_CONFIGURATION
fn minimal_valid_configuration() -> serde_json::Value {
@@ -31,8 +32,8 @@ fn minimal_valid_configuration() -> serde_json::Value {
})
}
-fn validate_input(command: Vec<(PhpMixed, PhpMixed)>) -> Vec<(PhpMixed, PhpMixed)> {
- let mut input = vec![(PhpMixed::from("command"), PhpMixed::from("validate"))];
+fn validate_input(command: Vec<(ParameterName, InputValue)>) -> Vec<(ParameterName, InputValue)> {
+ let mut input = vec![(ParameterName::of("command"), InputValue::from("validate"))];
input.extend(command);
input
}
@@ -40,7 +41,7 @@ fn validate_input(command: Vec<(PhpMixed, PhpMixed)>) -> Vec<(PhpMixed, PhpMixed
struct ValidateCase {
name: &'static str,
composer_json: serde_json::Value,
- command: Vec<(PhpMixed, PhpMixed)>,
+ command: Vec<(ParameterName, InputValue)>,
expected: &'static str,
}
@@ -86,7 +87,10 @@ fn provide_validate_tests() -> Vec<ValidateCase> {
ValidateCase {
name: "passing without publish-check",
composer_json: publish_data_stripped,
- command: vec![(PhpMixed::from("--no-check-publish"), PhpMixed::Bool(true))],
+ command: vec![(
+ ParameterName::of("--no-check-publish"),
+ InputValue::Bool(true),
+ )],
expected: "./composer.json is valid, but with a few warnings\n<warning>See https://getcomposer.org/doc/04-schema.md for details on the schema</warning>\n<warning># General warnings</warning>\n- No license specified, it is recommended to do so. For closed-source software you may use \"proprietary\" as license.",
},
]