aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/command/complete_command.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/command/complete_command.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/command/complete_command.rs')
-rw-r--r--crates/shirabe-symfony-console/src/command/complete_command.rs17
1 files changed, 9 insertions, 8 deletions
diff --git a/crates/shirabe-symfony-console/src/command/complete_command.rs b/crates/shirabe-symfony-console/src/command/complete_command.rs
index 432888b6..2f540f42 100644
--- a/crates/shirabe-symfony-console/src/command/complete_command.rs
+++ b/crates/shirabe-symfony-console/src/command/complete_command.rs
@@ -7,6 +7,7 @@ use crate::completion::CompletionOutputInterface;
use crate::completion::{CompletionSuggestions, StringOrSuggestion};
use crate::input::InputInterface;
use crate::input::InputOption;
+use crate::input::InputValue;
use crate::output::OutputInterface;
use indexmap::IndexMap;
use shirabe_php_shim::{PhpMixed, impl_php_class};
@@ -191,31 +192,31 @@ impl Command for CompleteCommand {
self.inner
.add_option(
"shell",
- PhpMixed::from("s".to_string()),
+ Some("s"),
Some(InputOption::VALUE_REQUIRED),
&format!("The shell type (\"{}\")", shells),
- PhpMixed::Null,
+ InputValue::Null,
)?
.add_option(
"input",
- PhpMixed::from("i".to_string()),
+ Some("i"),
Some(InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY),
"An array of input tokens (e.g. COMP_WORDS or argv)",
- PhpMixed::Null,
+ InputValue::Null,
)?
.add_option(
"current",
- PhpMixed::from("c".to_string()),
+ Some("c"),
Some(InputOption::VALUE_REQUIRED),
"The index of the \"input\" array that the cursor is in (e.g. COMP_CWORD)",
- PhpMixed::Null,
+ InputValue::Null,
)?
.add_option(
"symfony",
- PhpMixed::from("S".to_string()),
+ Some("S"),
Some(InputOption::VALUE_REQUIRED),
"The version of the completion script",
- PhpMixed::Null,
+ InputValue::Null,
)?;
Ok(())