From 0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 19 Aug 2026 23:45:37 +0900 Subject: 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) --- .../src/descriptor/json_descriptor.rs | 23 ++++++---------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs') diff --git a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs index 53941663..97c1c4f1 100644 --- a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs @@ -165,14 +165,9 @@ impl JsonDescriptor { argument.get_description(), )), ); - data.insert( - "default".to_string(), - if matches!(argument.get_default(), PhpMixed::Float(f) if f.is_infinite() && *f > 0.0) { - PhpMixed::String("INF".to_string()) - } else { - argument.get_default().clone() - }, - ); + // TODO(type-model): PHP compares the default against `INF` and serializes it as the + // string "INF"; `InputValue` has no float variant to hold one. + data.insert("default".to_string(), argument.get_default().clone().into()); Ok(data) } @@ -226,15 +221,9 @@ impl JsonDescriptor { option.get_description(), )), ); - data.insert( - "default".to_string(), - if matches!(option.get_default(), PhpMixed::Float(f) if f.is_infinite() && *f > 0.0) - { - PhpMixed::String("INF".to_string()) - } else { - option.get_default().clone() - }, - ); + // TODO(type-model): PHP compares the default against `INF` and serializes it as the + // string "INF"; `InputValue` has no float variant to hold one. + data.insert("default".to_string(), option.get_default().clone().into()); } Ok(data) } -- cgit v1.3.1-4-g156e