aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/console/input
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/src/console/input
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/src/console/input')
-rw-r--r--crates/shirabe/src/console/input/input_argument.rs8
-rw-r--r--crates/shirabe/src/console/input/input_option.rs16
2 files changed, 11 insertions, 13 deletions
diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs
index 1e550926..8f7d526c 100644
--- a/crates/shirabe/src/console/input/input_argument.rs
+++ b/crates/shirabe/src/console/input/input_argument.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Console/Input/InputArgument.php
use crate::console::input::SuggestedValues;
-use shirabe_php_shim::PhpMixed;
use shirabe_symfony_console::completion::CompletionInput;
use shirabe_symfony_console::completion::CompletionSuggestions;
use shirabe_symfony_console::input::InputArgument as BaseInputArgument;
+use shirabe_symfony_console::input::InputValue;
#[derive(Debug)]
pub struct InputArgument {
@@ -21,7 +21,7 @@ impl InputArgument {
name: &str,
mode: Option<i64>,
description: &str,
- default: Option<PhpMixed>,
+ default: Option<InputValue>,
) -> anyhow::Result<Self> {
Self::new5(
name,
@@ -37,14 +37,14 @@ impl InputArgument {
name: &str,
mode: Option<i64>,
description: &str,
- default: Option<PhpMixed>,
+ default: Option<InputValue>,
suggested_values: SuggestedValues,
) -> anyhow::Result<Self> {
let inner = BaseInputArgument::new(
name.to_string(),
mode,
description.to_string(),
- default.unwrap_or(PhpMixed::Null),
+ default.unwrap_or(InputValue::Null),
)?;
Ok(Self {
inner,
diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs
index 976f006f..6e84967e 100644
--- a/crates/shirabe/src/console/input/input_option.rs
+++ b/crates/shirabe/src/console/input/input_option.rs
@@ -1,10 +1,10 @@
//! ref: composer/src/Composer/Console/Input/InputOption.php
use crate::console::input::SuggestedValues;
-use shirabe_php_shim::PhpMixed;
use shirabe_symfony_console::completion::CompletionInput;
use shirabe_symfony_console::completion::CompletionSuggestions;
use shirabe_symfony_console::input::InputOption as BaseInputOption;
+use shirabe_symfony_console::input::InputValue;
#[derive(Debug)]
pub struct InputOption {
@@ -21,10 +21,10 @@ impl InputOption {
pub fn new(
name: &str,
- shortcut: Option<PhpMixed>,
+ shortcut: Option<&str>,
mode: Option<i64>,
description: &str,
- default: Option<PhpMixed>,
+ default: Option<InputValue>,
) -> anyhow::Result<Self> {
Self::new6(
name,
@@ -39,16 +39,14 @@ impl InputOption {
/// PHP's constructor with the sixth parameter, `$suggestedValues`.
pub fn new6(
name: &str,
- shortcut: Option<PhpMixed>,
+ shortcut: Option<&str>,
mode: Option<i64>,
description: &str,
- default: Option<PhpMixed>,
+ default: Option<InputValue>,
suggested_values: SuggestedValues,
) -> anyhow::Result<Self> {
- let shortcut = shortcut.unwrap_or(PhpMixed::Null);
- let default_mixed = default.unwrap_or(PhpMixed::Null);
- let inner =
- BaseInputOption::new(name, shortcut, mode, description.to_string(), default_mixed)?;
+ let default = default.unwrap_or(InputValue::Null);
+ let inner = BaseInputOption::new(name, shortcut, mode, description.to_string(), default)?;
// PHP throws LogicException here; suggested values on a valueless option cannot happen
// at runtime unless a configure() is wrong, so this is a programming error.
assert!(