diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-19 23:45:37 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-19 23:45:37 +0900 |
| commit | 0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc (patch) | |
| tree | ba5602549ce20b8d71136423e85dffc25deafff4 /crates/shirabe-symfony-console/src/completion/completion_input.rs | |
| parent | 6ed3a85dd636366d194c9810fd777db7f25e263f (diff) | |
| download | php-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/completion/completion_input.rs')
| -rw-r--r-- | crates/shirabe-symfony-console/src/completion/completion_input.rs | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/crates/shirabe-symfony-console/src/completion/completion_input.rs b/crates/shirabe-symfony-console/src/completion/completion_input.rs index c667ef60..419e6e80 100644 --- a/crates/shirabe-symfony-console/src/completion/completion_input.rs +++ b/crates/shirabe-symfony-console/src/completion/completion_input.rs @@ -3,7 +3,8 @@ use crate::input::ArgvInput; use crate::input::InputDefinition; use crate::input::InputOption; -use shirabe_php_shim::{PhpMixed, php_regex, preg_match_all}; +use crate::input::InputValue; +use shirabe_php_shim::{php_regex, preg_match_all}; /// An input specialized for shell completion. /// @@ -148,13 +149,10 @@ impl CompletionInput { let argument_value = self.inner.inner.arguments[¤t_argument_name].clone(); self.completion_name = Some(current_argument_name.clone()); - if let PhpMixed::List(argument_value) = &argument_value { - self.completion_value = argument_value - .last() - .map(|v| v.to_string()) - .unwrap_or_default(); + if let InputValue::Array(argument_value) = &argument_value { + self.completion_value = argument_value.last().cloned().unwrap_or_default(); } else { - self.completion_value = argument_value.to_string(); + self.completion_value = argument_value.to_php_string(); } } @@ -165,7 +163,7 @@ impl CompletionInput { .inner .inner .definition - .get_argument(&PhpMixed::String(argument_name.clone())) + .get_argument(&crate::input::ArgumentName::of(&argument_name)) .unwrap() .is_array() { @@ -304,16 +302,16 @@ impl crate::input::InputInterface for CompletionInput { self.to_string() } - fn has_parameter_option(&self, values: PhpMixed, only_params: bool) -> bool { + fn has_parameter_option(&self, values: &[&str], only_params: bool) -> bool { crate::input::InputInterface::has_parameter_option(&self.inner, values, only_params) } fn get_parameter_option( &self, - values: PhpMixed, - default: PhpMixed, + values: &[&str], + default: InputValue, only_params: bool, - ) -> PhpMixed { + ) -> InputValue { crate::input::InputInterface::get_parameter_option( &self.inner, values, @@ -330,15 +328,15 @@ impl crate::input::InputInterface for CompletionInput { crate::input::InputInterface::validate(&mut self.inner) } - fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed> { + fn get_arguments(&self) -> indexmap::IndexMap<String, InputValue> { crate::input::InputInterface::get_arguments(&self.inner) } - fn get_argument(&self, name: &str) -> anyhow::Result<PhpMixed> { + fn get_argument(&self, name: &str) -> anyhow::Result<InputValue> { crate::input::InputInterface::get_argument(&self.inner, name) } - fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> { + fn set_argument(&mut self, name: &str, value: InputValue) -> anyhow::Result<()> { crate::input::InputInterface::set_argument(&mut self.inner, name, value) } @@ -346,15 +344,15 @@ impl crate::input::InputInterface for CompletionInput { crate::input::InputInterface::has_argument(&self.inner, name) } - fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed> { + fn get_options(&self) -> indexmap::IndexMap<String, InputValue> { crate::input::InputInterface::get_options(&self.inner) } - fn get_option(&self, name: &str) -> anyhow::Result<crate::input::InputOptionValue> { + fn get_option(&self, name: &str) -> anyhow::Result<InputValue> { crate::input::InputInterface::get_option(&self.inner, name) } - fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> { + fn set_option(&mut self, name: &str, value: InputValue) -> anyhow::Result<()> { crate::input::InputInterface::set_option(&mut self.inner, name, value) } |
