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) --- .../src/input/input_interface.rs | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'crates/shirabe-symfony-console/src/input/input_interface.rs') 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; - 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; + fn get_arguments(&self) -> indexmap::IndexMap; - fn get_argument(&self, name: &str) -> anyhow::Result; + fn get_argument(&self, name: &str) -> anyhow::Result; - 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; + fn get_options(&self) -> indexmap::IndexMap; - fn get_option(&self, name: &str) -> anyhow::Result; + fn get_option(&self, name: &str) -> anyhow::Result; - 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; -- cgit v1.3.1-4-g156e