aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/remove_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/remove_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/remove_command.rs')
-rw-r--r--crates/shirabe/src/command/remove_command.rs25
1 files changed, 11 insertions, 14 deletions
diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs
index 7eb88f2b..9004a9fd 100644
--- a/crates/shirabe/src/command/remove_command.rs
+++ b/crates/shirabe/src/command/remove_command.rs
@@ -21,6 +21,7 @@ use shirabe_php_shim::{PhpMixed, UnexpectedValueException, impl_php_class, preg_
use shirabe_symfony_console::command::Command;
use shirabe_symfony_console::exception::InvalidArgumentException;
use shirabe_symfony_console::input::InputInterface;
+use shirabe_symfony_console::input::InputValue;
use shirabe_symfony_console::output::OutputInterface;
#[derive(Debug)]
@@ -93,7 +94,7 @@ impl Command for RemoveCommand {
None,
Some(InputOption::VALUE_REQUIRED),
"Audit output format. Must be \"table\", \"plain\", \"json\", or \"summary\".",
- Some(PhpMixed::String(Auditor::FORMAT_SUMMARY.to_string())),
+ Some(InputValue::String(Auditor::FORMAT_SUMMARY.to_string())),
SuggestedValues::List(Auditor::FORMATS.iter().map(|s| s.to_string()).collect())).unwrap().into(),
InputOption::new("no-security-blocking",
None,
@@ -106,12 +107,12 @@ impl Command for RemoveCommand {
"Run the dependency update with the --no-dev option.",
None).unwrap().into(),
InputOption::new("update-with-dependencies",
- Some(PhpMixed::String("w".to_string())),
+ Some("w"),
Some(InputOption::VALUE_NONE),
"Allows inherited dependencies to be updated with explicit dependencies (can also be set via the COMPOSER_WITH_DEPENDENCIES=1 env var). (Deprecated, is now default behavior)",
None).unwrap().into(),
InputOption::new("update-with-all-dependencies",
- Some(PhpMixed::String("W".to_string())),
+ Some("W"),
Some(InputOption::VALUE_NONE),
"Allows all inherited dependencies to be updated, including those that are root requirements (can also be set via the COMPOSER_WITH_ALL_DEPENDENCIES=1 env var).",
None).unwrap().into(),
@@ -126,7 +127,7 @@ impl Command for RemoveCommand {
"Does not allow inherited dependencies to be updated with explicit dependencies.",
None).unwrap().into(),
InputOption::new("minimal-changes",
- Some(PhpMixed::String("m".to_string())),
+ Some("m"),
Some(InputOption::VALUE_NONE),
"During an update with -w/-W, only perform absolutely necessary changes to transitive dependencies (can also be set via the COMPOSER_MINIMAL_CHANGES=1 env var).",
None).unwrap().into(),
@@ -146,12 +147,12 @@ impl Command for RemoveCommand {
"Ignore all platform requirements (php & ext- packages).",
None).unwrap().into(),
InputOption::new("optimize-autoloader",
- Some(PhpMixed::String("o".to_string())),
+ Some("o"),
Some(InputOption::VALUE_NONE),
"Optimize autoloader during autoloader dump",
None).unwrap().into(),
InputOption::new("classmap-authoritative",
- Some(PhpMixed::String("a".to_string())),
+ Some("a"),
Some(InputOption::VALUE_NONE),
"Autoload classes from the classmap only. Implicitly enables `--optimize-autoloader`.",
None).unwrap().into(),
@@ -183,8 +184,8 @@ impl Command for RemoveCommand {
if input
.borrow()
.get_argument("packages")?
- .as_list()
- .map(|l| l.is_empty())
+ .as_array()
+ .map(<[String]>::is_empty)
.unwrap_or(true)
&& !input
.borrow()
@@ -201,12 +202,8 @@ impl Command for RemoveCommand {
let mut packages: Vec<String> = input
.borrow()
.get_argument("packages")?
- .as_list()
- .map(|l| {
- l.iter()
- .filter_map(|v| v.as_string().map(strtolower))
- .collect()
- })
+ .as_array()
+ .map(|l| l.iter().map(|v| strtolower(v)).collect())
.unwrap_or_default();
if input