From 0800c90a7ec0bc7a3d4c13063dfe6d2298a557bc Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Wed, 19 Aug 2026 23:45:37 +0900
Subject: 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>
---
 crates/shirabe-symfony-console/src/command/command.rs | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'crates/shirabe-symfony-console/src/command/command.rs')

diff --git a/crates/shirabe-symfony-console/src/command/command.rs b/crates/shirabe-symfony-console/src/command/command.rs
index 27966ec1..3fd39bc4 100644
--- a/crates/shirabe-symfony-console/src/command/command.rs
+++ b/crates/shirabe-symfony-console/src/command/command.rs
@@ -9,6 +9,7 @@ use crate::input::InputArgument;
 use crate::input::InputDefinition;
 use crate::input::InputInterface;
 use crate::input::InputOption;
+use crate::input::InputValue;
 use crate::output::OutputInterface;
 use indexmap::IndexMap;
 use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match};
@@ -148,7 +149,7 @@ impl CommandData {
         name: &str,
         mode: Option<i64>,
         description: &str,
-        default: PhpMixed,
+        default: InputValue,
     ) -> anyhow::Result<&Self> {
         self.definition
             .borrow_mut()
@@ -178,10 +179,10 @@ impl CommandData {
     pub fn add_option(
         &self,
         name: &str,
-        shortcut: PhpMixed,
+        shortcut: Option<&str>,
         mode: Option<i64>,
         description: &str,
-        default: PhpMixed,
+        default: InputValue,
     ) -> anyhow::Result<&Self> {
         self.definition
             .borrow_mut()
@@ -189,7 +190,7 @@ impl CommandData {
             .unwrap()
             .add_option(InputOption::new(
                 name,
-                shortcut.clone(),
+                shortcut,
                 mode,
                 description.to_string(),
                 default.clone(),
@@ -403,12 +404,12 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny + shirabe_php_shim:
         // It would fail the validation if we didn't make sure the command argument is present,
         // since it's required by the application.
         if input.borrow().has_argument("command")
-            && matches!(input.borrow().get_argument("command")?, PhpMixed::Null)
+            && input.borrow().get_argument("command")?.is_null()
         {
             let name = self.get_name();
             input
                 .borrow_mut()
-                .set_argument("command", PhpMixed::from(name))?;
+                .set_argument("command", InputValue::from(name))?;
         }
 
         input.borrow_mut().validate()?;
-- 
cgit v1.3.1-4-g156e