aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/suggests_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/suggests_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/suggests_command.rs')
-rw-r--r--crates/shirabe/src/command/suggests_command.rs14
1 files changed, 10 insertions, 4 deletions
diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs
index 44f903da..e34a1faa 100644
--- a/crates/shirabe/src/command/suggests_command.rs
+++ b/crates/shirabe/src/command/suggests_command.rs
@@ -12,7 +12,7 @@ use crate::repository::RepositoryInterface;
use crate::repository::RepositoryInterfaceHandle;
use crate::repository::RootPackageRepository;
use indexmap::IndexMap;
-use shirabe_php_shim::{PhpMixed, empty, impl_php_class, in_array_loose};
+use shirabe_php_shim::{PhpMixed, impl_php_class, in_array_loose};
use shirabe_symfony_console::command::Command;
use shirabe_symfony_console::input::InputInterface;
use shirabe_symfony_console::output::OutputInterface;
@@ -67,7 +67,7 @@ impl Command for SuggestsCommand {
.into(),
InputOption::new(
"all",
- Some(PhpMixed::String("a".to_string())),
+ Some("a"),
Some(InputOption::VALUE_NONE),
"Show suggestions from all dependencies, including transitive ones",
None,
@@ -168,12 +168,18 @@ impl Command for SuggestsCommand {
let mut reporter = SuggestedPackagesReporter::new(self.get_io().clone());
let filter = input.borrow().get_argument("packages")?;
+ let filter_values: Vec<PhpMixed> = filter
+ .as_array()
+ .unwrap_or_default()
+ .iter()
+ .map(|value| PhpMixed::String(value.clone()))
+ .collect();
let mut packages = RepositoryInterface::get_packages(&mut installed_repo)?;
let root_pkg_as_base: crate::package::BasePackageHandle =
composer.get_package().clone().into();
packages.push(root_pkg_as_base);
for package in &packages {
- if !empty(&filter) && !in_array_loose(package.get_name(), filter.values()) {
+ if filter.to_bool() && !in_array_loose(package.get_name(), &filter_values) {
continue;
}
reporter.add_suggestions_from_package(package.clone());
@@ -207,7 +213,7 @@ impl Command for SuggestsCommand {
}
let only_dependents_of: Option<crate::package::PackageInterfaceHandle> =
- if empty(&filter) && !input.borrow().get_option("all")?.as_bool().unwrap_or(false) {
+ if !filter.to_bool() && !input.borrow().get_option("all")?.as_bool().unwrap_or(false) {
Some(composer.get_package().clone().into())
} else {
None