aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/show_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/show_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/show_command.rs')
-rw-r--r--crates/shirabe/src/command/show_command.rs17
1 files changed, 10 insertions, 7 deletions
diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs
index 3cc80b4c..f605e2b5 100644
--- a/crates/shirabe/src/command/show_command.rs
+++ b/crates/shirabe/src/command/show_command.rs
@@ -49,6 +49,7 @@ use shirabe_symfony_console::command::Command;
use shirabe_symfony_console::formatter::OutputFormatter;
use shirabe_symfony_console::formatter::OutputFormatterStyle;
use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputValue;
use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
@@ -1345,7 +1346,7 @@ impl Command for ShowCommand {
let opt_none = |name: &str, shortcut: Option<&str>, description: &str| {
InputOption::new(
name,
- shortcut.map(|s| PhpMixed::String(s.to_string())),
+ shortcut,
Some(InputOption::VALUE_NONE),
description,
None,
@@ -1432,10 +1433,10 @@ impl Command for ShowCommand {
),
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()
@@ -1485,7 +1486,7 @@ impl Command for ShowCommand {
if input.borrow().get_option("outdated")?.as_bool() == Some(true) {
input
.borrow_mut()
- .set_option("latest", PhpMixed::Bool(true));
+ .set_option("latest", InputValue::Bool(true));
} else if input
.borrow()
.get_option("ignore")?
@@ -1857,7 +1858,7 @@ impl Command for ShowCommand {
);
input
.borrow_mut()
- .set_option("latest", PhpMixed::Bool(false));
+ .set_option("latest", InputValue::Bool(false));
}
let package_filter: Option<String> = input
@@ -1876,7 +1877,7 @@ impl Command for ShowCommand {
&installed_repo,
&repos,
pf,
- input.borrow().get_argument("version")?,
+ input.borrow().get_argument("version")?.to_php_mixed(),
)?;
if let Some(ref pkg) = matched_package
@@ -2084,7 +2085,9 @@ impl Command for ShowCommand {
self.get_io().write_error(
"No composer.json found in the current directory, disabling \"path\" option",
);
- input.borrow_mut().set_option("path", PhpMixed::Bool(false));
+ input
+ .borrow_mut()
+ .set_option("path", InputValue::Bool(false));
}
for repo in RepositoryUtils::flatten_repositories(repos, true) {