aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/input/input_argument.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/input_argument.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/input_argument.rs')
-rw-r--r--crates/shirabe-symfony-console/src/input/input_argument.rs18
1 files changed, 9 insertions, 9 deletions
diff --git a/crates/shirabe-symfony-console/src/input/input_argument.rs b/crates/shirabe-symfony-console/src/input/input_argument.rs
index 5ca91a6b..ef07af0e 100644
--- a/crates/shirabe-symfony-console/src/input/input_argument.rs
+++ b/crates/shirabe-symfony-console/src/input/input_argument.rs
@@ -2,13 +2,13 @@
use crate::exception::InvalidArgumentException;
use crate::exception::LogicException;
-use shirabe_php_shim::PhpMixed;
+use crate::input::InputValue;
#[derive(Debug, Clone)]
pub struct InputArgument {
name: String,
mode: i64,
- default: PhpMixed,
+ default: InputValue,
description: String,
}
@@ -21,7 +21,7 @@ impl InputArgument {
name: String,
mode: Option<i64>,
description: String,
- default: PhpMixed,
+ default: InputValue,
) -> anyhow::Result<Self> {
let mode = match mode {
None => Self::OPTIONAL,
@@ -39,7 +39,7 @@ impl InputArgument {
name,
mode,
description,
- default: PhpMixed::Null,
+ default: InputValue::Null,
};
argument.set_default(default)?;
@@ -59,8 +59,8 @@ impl InputArgument {
Self::IS_ARRAY == (Self::IS_ARRAY & self.mode)
}
- pub fn set_default(&mut self, default: PhpMixed) -> anyhow::Result<()> {
- if self.is_required() && !matches!(default, PhpMixed::Null) {
+ pub fn set_default(&mut self, default: InputValue) -> anyhow::Result<()> {
+ if self.is_required() && !default.is_null() {
return Err(LogicException::new(
"Cannot set a default value except for InputArgument::OPTIONAL mode.".to_string(),
)
@@ -69,8 +69,8 @@ impl InputArgument {
let default = if self.is_array() {
match default {
- PhpMixed::Null => PhpMixed::List(vec![]),
- PhpMixed::List(_) => default,
+ InputValue::Null => InputValue::Array(vec![]),
+ InputValue::Array(_) => default,
_ => {
return Err(LogicException::new(
"A default value for an array argument must be an array.".to_string(),
@@ -86,7 +86,7 @@ impl InputArgument {
Ok(())
}
- pub fn get_default(&self) -> &PhpMixed {
+ pub fn get_default(&self) -> &InputValue {
&self.default
}