aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/input/string_input.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/input/string_input.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/input/string_input.rs')
-rw-r--r--crates/shirabe-symfony-console/src/input/string_input.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs
index 9fcb3fc8..09cee120 100644
--- a/crates/shirabe-symfony-console/src/input/string_input.rs
+++ b/crates/shirabe-symfony-console/src/input/string_input.rs
@@ -4,10 +4,10 @@ use crate::exception::InvalidArgumentException;
use crate::input::ArgvInput;
use crate::input::InputDefinition;
use crate::input::InputInterface;
-use crate::input::InputOptionValue;
+use crate::input::InputValue;
use crate::input::StreamableInputInterface;
use indexmap::IndexMap;
-use shirabe_php_shim::{PhpMixed, php_regex, preg_match};
+use shirabe_php_shim::{php_regex, preg_match};
/// StringInput represents an input provided as a string.
///
@@ -137,16 +137,16 @@ impl InputInterface for StringInput {
self.inner.get_first_argument()
}
- fn has_parameter_option(&self, values: PhpMixed, only_params: bool) -> bool {
+ fn has_parameter_option(&self, values: &[&str], only_params: bool) -> bool {
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 {
InputInterface::get_parameter_option(&self.inner, values, default, only_params)
}
@@ -158,15 +158,15 @@ impl InputInterface for StringInput {
self.inner.validate()
}
- fn get_arguments(&self) -> IndexMap<String, PhpMixed> {
+ fn get_arguments(&self) -> IndexMap<String, InputValue> {
InputInterface::get_arguments(&self.inner)
}
- fn get_argument(&self, name: &str) -> anyhow::Result<PhpMixed> {
+ fn get_argument(&self, name: &str) -> anyhow::Result<InputValue> {
self.inner.get_argument(name)
}
- fn set_argument(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> {
+ fn set_argument(&mut self, name: &str, value: InputValue) -> anyhow::Result<()> {
self.inner.set_argument(name, value)
}
@@ -174,15 +174,15 @@ impl InputInterface for StringInput {
self.inner.has_argument(name)
}
- fn get_options(&self) -> IndexMap<String, PhpMixed> {
+ fn get_options(&self) -> IndexMap<String, InputValue> {
InputInterface::get_options(&self.inner)
}
- fn get_option(&self, name: &str) -> anyhow::Result<InputOptionValue> {
+ fn get_option(&self, name: &str) -> anyhow::Result<InputValue> {
self.inner.get_option(name)
}
- fn set_option(&mut self, name: &str, value: PhpMixed) -> anyhow::Result<()> {
+ fn set_option(&mut self, name: &str, value: InputValue) -> anyhow::Result<()> {
self.inner.set_option(name, value)
}