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/input/input_interface.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/input/input_interface.rs')
| -rw-r--r-- | crates/shirabe-symfony-console/src/input/input_interface.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/crates/shirabe-symfony-console/src/input/input_interface.rs b/crates/shirabe-symfony-console/src/input/input_interface.rs index 3c3ec2d5..85cd5e7f 100644 --- a/crates/shirabe-symfony-console/src/input/input_interface.rs +++ b/crates/shirabe-symfony-console/src/input/input_interface.rs @@ -1,9 +1,8 @@ //! ref: composer/vendor/symfony/console/Input/InputInterface.php use crate::input::InputDefinition; -use crate::input::InputOptionValue; +use crate::input::InputValue; use crate::input::StreamableInputInterface; -use shirabe_php_shim::PhpMixed; pub trait InputInterface: std::fmt::Debug + shirabe_php_shim::AsAny { /// Models PHP's `clone` operatior. @@ -11,32 +10,32 @@ pub trait InputInterface: std::fmt::Debug + shirabe_php_shim::AsAny { fn get_first_argument(&self) -> Option<String>; - fn has_parameter_option(&self, values: PhpMixed, only_params: bool) -> bool; + fn has_parameter_option(&self, values: &[&str], only_params: bool) -> bool; fn get_parameter_option( &self, - values: PhpMixed, - default: PhpMixed, + values: &[&str], + default: InputValue, only_params: bool, - ) -> PhpMixed; + ) -> InputValue; fn bind(&mut self, definition: &InputDefinition) -> anyhow::Result<()>; fn validate(&mut self) -> anyhow::Result<()>; - fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed>; + fn get_arguments(&self) -> indexmap::IndexMap<String, InputValue>; - fn get_argument(&self, name: &str) -> anyhow::Result<PhpMixed>; + fn get_argument(&self, name: &str) -> anyhow::Result<InputValue>; - fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>; + fn set_argument(&mut self, name: &str, value: InputValue) -> anyhow::Result<()>; fn has_argument(&self, name: &str) -> bool; - fn get_options(&self) -> indexmap::IndexMap<String, PhpMixed>; + fn get_options(&self) -> indexmap::IndexMap<String, InputValue>; - fn get_option(&self, name: &str) -> anyhow::Result<InputOptionValue>; + fn get_option(&self, name: &str) -> anyhow::Result<InputValue>; - fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()>; + fn set_option(&mut self, name: &str, value: InputValue) -> anyhow::Result<()>; fn has_option(&self, name: &str) -> bool; |
