aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/descriptor/text_descriptor.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-symfony-console/src/descriptor/text_descriptor.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-symfony-console/src/descriptor/text_descriptor.rs')
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs20
1 files changed, 10 insertions, 10 deletions
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()