diff options
Diffstat (limited to 'crates/shirabe-symfony-console/src/descriptor')
4 files changed, 28 insertions, 37 deletions
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) } diff --git a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs index d6285468..f7b3cd71 100644 --- a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs @@ -64,7 +64,7 @@ impl MarkdownDescriptor { shirabe_php_shim::str_replace( "\n", "", - &shirabe_php_shim::var_export(argument.get_default(), true), + &shirabe_php_shim::var_export(&argument.get_default().to_php_mixed(), true), ), ), true, @@ -104,7 +104,7 @@ impl MarkdownDescriptor { shirabe_php_shim::str_replace( "\n", "", - &shirabe_php_shim::var_export(option.get_default(), true), + &shirabe_php_shim::var_export(&option.get_default().to_php_mixed(), true), ), ), true, diff --git a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs index 8783ef5e..c15cdebb 100644 --- a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs @@ -36,15 +36,14 @@ impl TextDescriptor { argument: &InputArgument, options: IndexMap<String, PhpMixed>, ) -> anyhow::Result<()> { - let default = if !argument.get_default().is_null() - && (!matches!( - argument.get_default(), - PhpMixed::List(_) | PhpMixed::Array(_) - ) || shirabe_php_shim::count(argument.get_default()) != 0) + let default_value = argument.get_default().to_php_mixed(); + let default = if !default_value.is_null() + && (!matches!(default_value, PhpMixed::List(_) | PhpMixed::Array(_)) + || shirabe_php_shim::count(&default_value) != 0) { format!( "<comment> [default: {}]</comment>", - self.format_default_value(argument.get_default())? + self.format_default_value(&default_value)? ) } else { String::new() @@ -82,14 +81,15 @@ impl TextDescriptor { option: &InputOption, options: IndexMap<String, PhpMixed>, ) -> anyhow::Result<()> { + let default_value = option.get_default().to_php_mixed(); let default = if option.accept_value() - && !option.get_default().is_null() - && (!matches!(option.get_default(), PhpMixed::List(_) | PhpMixed::Array(_)) - || shirabe_php_shim::count(option.get_default()) != 0) + && !default_value.is_null() + && (!matches!(default_value, PhpMixed::List(_) | PhpMixed::Array(_)) + || shirabe_php_shim::count(&default_value) != 0) { format!( "<comment> [default: {}]</comment>", - self.format_default_value(option.get_default())? + self.format_default_value(&default_value)? ) } else { String::new() 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<String> = match argument.get_default() { + let default_value = argument.get_default().to_php_mixed(); + let defaults: Vec<String> = 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<String> = match option.get_default() { + let default_value = option.get_default().to_php_mixed(); + let defaults: Vec<String> = 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![], }; |