aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/plugin
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/plugin
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/plugin')
-rw-r--r--crates/shirabe/src/plugin/php_plugin_proxy.rs14
1 files changed, 9 insertions, 5 deletions
diff --git a/crates/shirabe/src/plugin/php_plugin_proxy.rs b/crates/shirabe/src/plugin/php_plugin_proxy.rs
index 643658e3..4b99f528 100644
--- a/crates/shirabe/src/plugin/php_plugin_proxy.rs
+++ b/crates/shirabe/src/plugin/php_plugin_proxy.rs
@@ -35,6 +35,7 @@ use shirabe_php_rpc::{
use shirabe_php_shim::PhpMixed;
use shirabe_symfony_console::command::Command;
use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputValue;
use shirabe_symfony_console::output::OutputInterface;
/// A Rust-side entity a PHP proxy stub points back to.
@@ -3295,7 +3296,7 @@ impl PhpCommandProxy {
if is_array {
mode |= InputArgument::IS_ARRAY;
}
- let default = field(&mut row, "default").to_php_mixed()?;
+ let default = InputValue::from_php_mixed(&field(&mut row, "default").to_php_mixed()?);
items.push(DefinitionItem::InputArgument(InputArgument::new(
name,
Some(mode),
@@ -3334,17 +3335,20 @@ impl PhpCommandProxy {
if matches!(field(&mut row, "isNegatable"), PluginValue::Bool(true)) {
mode |= InputOption::VALUE_NEGATABLE;
}
- let shortcut = field(&mut row, "shortcut").to_php_mixed()?;
+ let shortcut = match field(&mut row, "shortcut").to_php_mixed()? {
+ PhpMixed::String(shortcut) => Some(shortcut),
+ _ => None,
+ };
// `getDefault()` exposes the stored representation (`false` for VALUE_NONE), while
// the constructor only accepts null there; mirror the constructor's normalization.
let default = if accept_value {
- field(&mut row, "default").to_php_mixed()?
+ InputValue::from_php_mixed(&field(&mut row, "default").to_php_mixed()?)
} else {
- PhpMixed::Null
+ InputValue::Null
};
items.push(DefinitionItem::InputOption(InputOption::new(
&name,
- shortcut,
+ shortcut.as_deref(),
Some(mode),
description,
default,