aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/search_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/src/command/search_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/src/command/search_command.rs')
-rw-r--r--crates/shirabe/src/command/search_command.rs19
1 files changed, 8 insertions, 11 deletions
diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs
index e66c574b..0c7e8631 100644
--- a/crates/shirabe/src/command/search_command.rs
+++ b/crates/shirabe/src/command/search_command.rs
@@ -20,6 +20,7 @@ use shirabe_php_shim::{
use shirabe_symfony_console::command::Command;
use shirabe_symfony_console::formatter::OutputFormatter;
use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputValue;
use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
@@ -54,7 +55,7 @@ impl Command for SearchCommand {
self.set_definition(&[
InputOption::new(
"only-name",
- Some(PhpMixed::String("N".to_string())),
+ Some("N"),
Some(InputOption::VALUE_NONE),
"Search only in package names",
None,
@@ -63,7 +64,7 @@ impl Command for SearchCommand {
.into(),
InputOption::new(
"only-vendor",
- Some(PhpMixed::String("O".to_string())),
+ Some("O"),
Some(InputOption::VALUE_NONE),
"Search only for vendor / organization names, returns only \"vendor\" as result",
None,
@@ -72,7 +73,7 @@ impl Command for SearchCommand {
.into(),
InputOption::new(
"type",
- Some(PhpMixed::String("t".to_string())),
+ Some("t"),
Some(InputOption::VALUE_REQUIRED),
"Search for a specific package type",
None,
@@ -81,10 +82,10 @@ impl Command for SearchCommand {
.into(),
InputOption::new6(
"format",
- Some(PhpMixed::String("f".to_string())),
+ Some("f"),
Some(InputOption::VALUE_REQUIRED),
"Format of the output: text or json",
- Some(PhpMixed::String("text".to_string())),
+ Some(InputValue::String("text".to_string())),
SuggestedValues::List(vec!["json".to_string(), "text".to_string()]),
)
.unwrap()
@@ -204,12 +205,8 @@ impl Command for SearchCommand {
let tokens_arg = input.borrow().get_argument("tokens")?;
let token_strings: Vec<String> = tokens_arg
- .as_list()
- .map(|list| {
- list.iter()
- .filter_map(|v| v.as_string().map(|s| s.to_string()))
- .collect()
- })
+ .as_array()
+ .map(<[String]>::to_vec)
.unwrap_or_default();
let mut query = implode(" ", &token_strings);
if mode != repository_interface::SEARCH_FULLTEXT {