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/xml_descriptor.rs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs') diff --git a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs index 1a001b22..0b74fe3a 100644 --- a/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/xml_descriptor.rs @@ -233,13 +233,14 @@ impl XmlDescriptor { description_xml.append_child(dom.create_text_node(argument.get_description())); let defaults_xml = object_xml.append_child(dom.create_element("defaults")); - let defaults: Vec = match argument.get_default() { + let default_value = argument.get_default().to_php_mixed(); + let defaults: Vec = match &default_value { PhpMixed::List(_) | PhpMixed::Array(_) => { - self.default_values_as_strings(argument.get_default()) + self.default_values_as_strings(&default_value) } - PhpMixed::Bool(_) => vec![shirabe_php_shim::var_export(argument.get_default(), true)], + PhpMixed::Bool(_) => vec![shirabe_php_shim::var_export(&default_value, true)], d if shirabe_php_shim::php_truthy(d) => { - vec![shirabe_php_shim::php_to_string(argument.get_default())] + vec![shirabe_php_shim::php_to_string(&default_value)] } _ => vec![], }; @@ -294,13 +295,14 @@ impl XmlDescriptor { description_xml.append_child(dom.create_text_node(option.get_description())); if option.accept_value() { - let defaults: Vec = match option.get_default() { + let default_value = option.get_default().to_php_mixed(); + let defaults: Vec = match &default_value { PhpMixed::List(_) | PhpMixed::Array(_) => { - self.default_values_as_strings(option.get_default()) + self.default_values_as_strings(&default_value) } - PhpMixed::Bool(_) => vec![shirabe_php_shim::var_export(option.get_default(), true)], + PhpMixed::Bool(_) => vec![shirabe_php_shim::var_export(&default_value, true)], d if shirabe_php_shim::php_truthy(d) => { - vec![shirabe_php_shim::php_to_string(option.get_default())] + vec![shirabe_php_shim::php_to_string(&default_value)] } _ => vec![], }; -- cgit v1.3.1-4-g156e