aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/command/config_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/config_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/config_command_test.rs')
-rw-r--r--crates/shirabe/tests/command/config_command_test.rs32
1 files changed, 18 insertions, 14 deletions
diff --git a/crates/shirabe/tests/command/config_command_test.rs b/crates/shirabe/tests/command/config_command_test.rs
index 35ecb7a5..fc2d4874 100644
--- a/crates/shirabe/tests/command/config_command_test.rs
+++ b/crates/shirabe/tests/command/config_command_test.rs
@@ -2,28 +2,32 @@
use crate::test_case::{RunOptions, get_application_tester, init_temp_composer};
use serial_test::serial;
-use shirabe_php_shim::PhpMixed;
+use shirabe_symfony_console::input::InputValue;
+use shirabe_symfony_console::input::ParameterName;
/// `['command' => 'config'] + $command`, with the command name prepended.
-fn config_input(command: Vec<(PhpMixed, PhpMixed)>) -> Vec<(PhpMixed, PhpMixed)> {
- let mut input = vec![(PhpMixed::from("command"), PhpMixed::from("config"))];
+fn config_input(command: Vec<(ParameterName, InputValue)>) -> Vec<(ParameterName, InputValue)> {
+ let mut input = vec![(ParameterName::of("command"), InputValue::from("config"))];
input.extend(command);
input
}
-fn key(setting_key: &str) -> (PhpMixed, PhpMixed) {
- (PhpMixed::from("setting-key"), PhpMixed::from(setting_key))
+fn key(setting_key: &str) -> (ParameterName, InputValue) {
+ (
+ ParameterName::of("setting-key"),
+ InputValue::from(setting_key),
+ )
}
-fn value(values: &[&str]) -> (PhpMixed, PhpMixed) {
+fn value(values: &[&str]) -> (ParameterName, InputValue) {
(
- PhpMixed::from("setting-value"),
- PhpMixed::List(values.iter().map(|v| PhpMixed::from(*v)).collect()),
+ ParameterName::of("setting-value"),
+ InputValue::Array(values.iter().map(|v| v.to_string()).collect()),
)
}
-fn flag(name: &str) -> (PhpMixed, PhpMixed) {
- (PhpMixed::from(name), PhpMixed::Bool(true))
+fn flag(name: &str) -> (ParameterName, InputValue) {
+ (ParameterName::of(name), InputValue::Bool(true))
}
/// Reads CWD's composer.json as a `serde_json::Value` (mirrors PHP's `json_decode(..., true)`).
@@ -35,7 +39,7 @@ fn read_composer_json() -> serde_json::Value {
struct UpdateCase {
name: &'static str,
before: serde_json::Value,
- command: Vec<(PhpMixed, PhpMixed)>,
+ command: Vec<(ParameterName, InputValue)>,
expected: serde_json::Value,
}
@@ -325,7 +329,7 @@ fn test_config_updates() {
struct ReadCase {
name: &'static str,
composer_json: serde_json::Value,
- command: Vec<(PhpMixed, PhpMixed)>,
+ command: Vec<(ParameterName, InputValue)>,
expected: &'static str,
}
@@ -428,8 +432,8 @@ fn test_config_throws_for_invalid_arg_combination() {
let result = app_tester.run(
config_input(vec![
(
- PhpMixed::from("--file"),
- PhpMixed::from("alt.composer.json"),
+ ParameterName::of("--file"),
+ InputValue::from("alt.composer.json"),
),
flag("--global"),
]),