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) --- crates/shirabe-symfony-console/src/command/command.rs | 13 +++++++------ .../src/command/complete_command.rs | 17 +++++++++-------- .../src/command/dump_completion_command.rs | 7 ++++--- .../src/command/help_command.rs | 15 ++++++++------- .../src/command/list_command.rs | 19 ++++++++++--------- 5 files changed, 38 insertions(+), 33 deletions(-) (limited to 'crates/shirabe-symfony-console/src/command') diff --git a/crates/shirabe-symfony-console/src/command/command.rs b/crates/shirabe-symfony-console/src/command/command.rs index 27966ec1..3fd39bc4 100644 --- a/crates/shirabe-symfony-console/src/command/command.rs +++ b/crates/shirabe-symfony-console/src/command/command.rs @@ -9,6 +9,7 @@ use crate::input::InputArgument; use crate::input::InputDefinition; use crate::input::InputInterface; use crate::input::InputOption; +use crate::input::InputValue; use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match}; @@ -148,7 +149,7 @@ impl CommandData { name: &str, mode: Option, description: &str, - default: PhpMixed, + default: InputValue, ) -> anyhow::Result<&Self> { self.definition .borrow_mut() @@ -178,10 +179,10 @@ impl CommandData { pub fn add_option( &self, name: &str, - shortcut: PhpMixed, + shortcut: Option<&str>, mode: Option, description: &str, - default: PhpMixed, + default: InputValue, ) -> anyhow::Result<&Self> { self.definition .borrow_mut() @@ -189,7 +190,7 @@ impl CommandData { .unwrap() .add_option(InputOption::new( name, - shortcut.clone(), + shortcut, mode, description.to_string(), default.clone(), @@ -403,12 +404,12 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny + shirabe_php_shim: // It would fail the validation if we didn't make sure the command argument is present, // since it's required by the application. if input.borrow().has_argument("command") - && matches!(input.borrow().get_argument("command")?, PhpMixed::Null) + && input.borrow().get_argument("command")?.is_null() { let name = self.get_name(); input .borrow_mut() - .set_argument("command", PhpMixed::from(name))?; + .set_argument("command", InputValue::from(name))?; } input.borrow_mut().validate()?; diff --git a/crates/shirabe-symfony-console/src/command/complete_command.rs b/crates/shirabe-symfony-console/src/command/complete_command.rs index 432888b6..2f540f42 100644 --- a/crates/shirabe-symfony-console/src/command/complete_command.rs +++ b/crates/shirabe-symfony-console/src/command/complete_command.rs @@ -7,6 +7,7 @@ use crate::completion::CompletionOutputInterface; use crate::completion::{CompletionSuggestions, StringOrSuggestion}; use crate::input::InputInterface; use crate::input::InputOption; +use crate::input::InputValue; use crate::output::OutputInterface; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, impl_php_class}; @@ -191,31 +192,31 @@ impl Command for CompleteCommand { self.inner .add_option( "shell", - PhpMixed::from("s".to_string()), + Some("s"), Some(InputOption::VALUE_REQUIRED), &format!("The shell type (\"{}\")", shells), - PhpMixed::Null, + InputValue::Null, )? .add_option( "input", - PhpMixed::from("i".to_string()), + Some("i"), Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY), "An array of input tokens (e.g. COMP_WORDS or argv)", - PhpMixed::Null, + InputValue::Null, )? .add_option( "current", - PhpMixed::from("c".to_string()), + Some("c"), Some(InputOption::VALUE_REQUIRED), "The index of the \"input\" array that the cursor is in (e.g. COMP_CWORD)", - PhpMixed::Null, + InputValue::Null, )? .add_option( "symfony", - PhpMixed::from("S".to_string()), + Some("S"), Some(InputOption::VALUE_REQUIRED), "The version of the completion script", - PhpMixed::Null, + InputValue::Null, )?; Ok(()) diff --git a/crates/shirabe-symfony-console/src/command/dump_completion_command.rs b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs index 4db6c233..49a66f6d 100644 --- a/crates/shirabe-symfony-console/src/command/dump_completion_command.rs +++ b/crates/shirabe-symfony-console/src/command/dump_completion_command.rs @@ -6,6 +6,7 @@ use crate::completion::{CompletionSuggestions, StringOrSuggestion}; use crate::input::InputArgument; use crate::input::InputInterface; use crate::input::InputOption; +use crate::input::InputValue; use crate::output::OutputInterface; use crate::output::output_interface; use shirabe_php_shim::{PhpMixed, impl_php_class}; @@ -189,14 +190,14 @@ impl Command for DumpCompletionCommand { "shell", Some(InputArgument::OPTIONAL), "The shell type (e.g. \"bash\"), the value of the \"$SHELL\" env var will be used if this is not given", - PhpMixed::Null, + InputValue::Null, )?; self.inner.add_option( "debug", - PhpMixed::Null, + None, Some(InputOption::VALUE_NONE), "Tail the completion debug log", - PhpMixed::Null, + InputValue::Null, )?; Ok(()) diff --git a/crates/shirabe-symfony-console/src/command/help_command.rs b/crates/shirabe-symfony-console/src/command/help_command.rs index 2081e0e1..4d8f7dbd 100644 --- a/crates/shirabe-symfony-console/src/command/help_command.rs +++ b/crates/shirabe-symfony-console/src/command/help_command.rs @@ -10,8 +10,9 @@ use crate::input::DefinitionItem; use crate::input::InputArgument; use crate::input::InputInterface; use crate::input::InputOption; +use crate::input::InputValue; use crate::output::OutputInterface; -use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_php_shim::impl_php_class; use std::ops::{Deref, DerefMut}; /// HelpCommand displays the help for a given command. @@ -101,21 +102,21 @@ impl Command for HelpCommand { "command_name".to_string(), Some(InputArgument::OPTIONAL), "The command name".to_string(), - PhpMixed::from("help".to_string()), + InputValue::from("help".to_string()), )?), DefinitionItem::InputOption(InputOption::new( "format", - PhpMixed::Null, + None, Some(InputOption::VALUE_REQUIRED), "The output format (txt, xml, json, or md)".to_string(), - PhpMixed::from("txt".to_string()), + InputValue::from("txt".to_string()), )?), DefinitionItem::InputOption(InputOption::new( "raw", - PhpMixed::Null, + None, Some(InputOption::VALUE_NONE), "To output raw command help".to_string(), - PhpMixed::Null, + InputValue::Null, )?), ])); self.inner.set_description("Display help for a command"); @@ -141,7 +142,7 @@ impl Command for HelpCommand { ) -> anyhow::Result { if self.command.borrow().is_none() { let application = self.get_application().unwrap(); - let command_name = input.borrow().get_argument("command_name")?.to_string(); + let command_name = input.borrow().get_argument("command_name")?.to_php_string(); let found = application.borrow_mut().find(&command_name)?; *self.command.borrow_mut() = Some(found); } diff --git a/crates/shirabe-symfony-console/src/command/list_command.rs b/crates/shirabe-symfony-console/src/command/list_command.rs index 6074b49a..08faea71 100644 --- a/crates/shirabe-symfony-console/src/command/list_command.rs +++ b/crates/shirabe-symfony-console/src/command/list_command.rs @@ -10,8 +10,9 @@ use crate::input::DefinitionItem; use crate::input::InputArgument; use crate::input::InputInterface; use crate::input::InputOption; +use crate::input::InputValue; use crate::output::OutputInterface; -use shirabe_php_shim::{PhpMixed, impl_php_class}; +use shirabe_php_shim::impl_php_class; use std::ops::{Deref, DerefMut}; /// ListCommand displays the list of all available commands for the application. @@ -93,28 +94,28 @@ impl Command for ListCommand { "namespace".to_string(), Some(InputArgument::OPTIONAL), "The namespace name".to_string(), - PhpMixed::Null, + InputValue::Null, )?), DefinitionItem::InputOption(InputOption::new( "raw", - PhpMixed::Null, + None, Some(InputOption::VALUE_NONE), "To output raw command list".to_string(), - PhpMixed::Null, + InputValue::Null, )?), DefinitionItem::InputOption(InputOption::new( "format", - PhpMixed::Null, + None, Some(InputOption::VALUE_REQUIRED), "The output format (txt, xml, json, or md)".to_string(), - PhpMixed::from("txt".to_string()), + InputValue::from("txt".to_string()), )?), DefinitionItem::InputOption(InputOption::new( "short", - PhpMixed::Null, + None, Some(InputOption::VALUE_NONE), "To skip describing commands' arguments".to_string(), - PhpMixed::Null, + InputValue::Null, )?), ])); self.inner.set_description("List commands"); @@ -157,7 +158,7 @@ impl Command for ListCommand { ); options.insert( "namespace".to_string(), - input.borrow().get_argument("namespace")?, + input.borrow().get_argument("namespace")?.into(), ); options.insert( "short".to_string(), -- cgit v1.3.1-4-g156e