chore: unwrap meaningless PhpMixed::String()

5 files changed, 55 insertions, 92 deletions

diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
index 875d217..54a5f3a 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs
@@ -154,7 +154,7 @@ impl ArgvInput {
                     }
                 };
                 return Err(RuntimeException(shirabe_php_shim::RuntimeException {
-                    message: format!("The \"-{}\" option does not exist.", PhpMixed::String(bad),),
+                    message: format!("The \"-{}\" option does not exist.", bad),
                     code: 0,
                 })
                 .into());
@@ -254,12 +254,12 @@ impl ArgvInput {
                         format!(
                             "Too many arguments to \"{}\" command, expected arguments \"{}\".",
                             symfony_command_name.clone(),
-                            PhpMixed::String(shirabe_php_shim::implode("\" \"", &names)),
+                            shirabe_php_shim::implode("\" \"", &names),
                         )
                     }
                     _ => format!(
                         "Too many arguments, expected arguments \"{}\".",
-                        PhpMixed::String(shirabe_php_shim::implode("\" \"", &names)),
+                        shirabe_php_shim::implode("\" \"", &names),
                     ),
                 }
             } else if symfony_command_name
@@ -270,13 +270,10 @@ impl ArgvInput {
                 format!(
                     "No arguments expected for \"{}\" command, got \"{}\".",
                     symfony_command_name.clone().unwrap(),
-                    PhpMixed::String(token.to_string()),
+                    token.to_string(),
                 )
             } else {
-                format!(
-                    "No arguments expected, got \"{}\".",
-                    PhpMixed::String(token.to_string()),
-                )
+                format!("No arguments expected, got \"{}\".", token.to_string())
             };
 
             return Err(
@@ -291,10 +288,7 @@ impl ArgvInput {
     fn add_short_option(&mut self, shortcut: &str, value: PhpMixed) -> anyhow::Result<()> {
         if !self.inner.definition.has_shortcut(shortcut) {
             return Err(RuntimeException(shirabe_php_shim::RuntimeException {
-                message: format!(
-                    "The \"-{}\" option does not exist.",
-                    PhpMixed::String(shortcut.to_string()),
-                ),
+                message: format!("The \"-{}\" option does not exist.", shortcut.to_string()),
                 code: 0,
             })
             .into());
@@ -314,10 +308,7 @@ impl ArgvInput {
         if !self.inner.definition.has_option(name) {
             if !self.inner.definition.has_negation(name) {
                 return Err(RuntimeException(shirabe_php_shim::RuntimeException {
-                    message: format!(
-                        "The \"--{}\" option does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"--{}\" option does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into());
@@ -328,7 +319,7 @@ impl ArgvInput {
                 return Err(RuntimeException(shirabe_php_shim::RuntimeException {
                     message: format!(
                         "The \"--{}\" option does not accept a value.",
-                        PhpMixed::String(name.to_string()),
+                        name.to_string(),
                     ),
                     code: 0,
                 })
@@ -347,7 +338,7 @@ impl ArgvInput {
             return Err(RuntimeException(shirabe_php_shim::RuntimeException {
                 message: format!(
                     "The \"--{}\" option does not accept a value.",
-                    PhpMixed::String(name.to_string()),
+                    name.to_string(),
                 ),
                 code: 0,
             })
@@ -373,10 +364,7 @@ impl ArgvInput {
         if matches!(value, PhpMixed::Null) {
             if option.is_value_required() {
                 return Err(RuntimeException(shirabe_php_shim::RuntimeException {
-                    message: format!(
-                        "The \"--{}\" option requires a value.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"--{}\" option requires a value.", name.to_string()),
                     code: 0,
                 })
                 .into());
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
index 327650b..384bc6d 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs
@@ -216,10 +216,7 @@ impl ArrayInput {
         if !self.inner.definition.has_shortcut(shortcut) {
             return Err(InvalidOptionException(InvalidArgumentException(
                 shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"-{}\" option does not exist.",
-                        PhpMixed::String(shortcut.to_string()),
-                    ),
+                    message: format!("The \"-{}\" option does not exist.", shortcut.to_string()),
                     code: 0,
                 },
             ))
@@ -241,10 +238,7 @@ impl ArrayInput {
             if !self.inner.definition.has_negation(name) {
                 return Err(InvalidOptionException(InvalidArgumentException(
                     shirabe_php_shim::InvalidArgumentException {
-                        message: format!(
-                            "The \"--{}\" option does not exist.",
-                            PhpMixed::String(name.to_string()),
-                        ),
+                        message: format!("The \"--{}\" option does not exist.", name.to_string()),
                         code: 0,
                     },
                 ))
@@ -263,16 +257,18 @@ impl ArrayInput {
 
         if matches!(value, PhpMixed::Null) {
             if option.is_value_required() {
-                return Err(InvalidOptionException(InvalidArgumentException(
-                    shirabe_php_shim::InvalidArgumentException {
-                        message: format!(
-                            "The \"--{}\" option requires a value.",
-                            PhpMixed::String(name.to_string()),
-                        ),
-                        code: 0,
-                    },
-                ))
-                .into());
+                return Err(
+                    InvalidOptionException(InvalidArgumentException(
+                        shirabe_php_shim::InvalidArgumentException {
+                            message: format!(
+                                "The \"--{}\" option requires a value.",
+                                name.to_string(),
+                            ),
+                            code: 0,
+                        },
+                    ))
+                    .into(),
+                );
             }
 
             if !option.is_value_optional() {
@@ -290,7 +286,7 @@ impl ArrayInput {
         if !self.inner.definition.has_argument(name) {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!("The \"{}\" argument does not exist.", name.clone(),),
+                    message: format!("The \"{}\" argument does not exist.", name.clone()),
                     code: 0,
                 })
                 .into(),
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input.rs b/crates/shirabe-external-packages/src/symfony/console/input/input.rs
index d365f8d..5e5a12b 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input.rs
@@ -83,7 +83,7 @@ impl Input {
             return Err(RuntimeException(shirabe_php_shim::RuntimeException {
                 message: format!(
                     "Not enough arguments (missing: \"{}\").",
-                    PhpMixed::String(shirabe_php_shim::implode(", ", &missing_arguments,)),
+                    shirabe_php_shim::implode(", ", &missing_arguments),
                 ),
                 code: 0,
             })
@@ -115,10 +115,7 @@ impl Input {
         {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"{}\" argument does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"{}\" argument does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -142,10 +139,7 @@ impl Input {
         {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"{}\" argument does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"{}\" argument does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -182,10 +176,7 @@ impl Input {
         if !self.definition.has_option(name) {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"{}\" option does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"{}\" option does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -209,10 +200,7 @@ impl Input {
         } else if !self.definition.has_option(name) {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"{}\" option does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"{}\" option does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into(),
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
index 911e287..56f685c 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/input_definition.rs
@@ -114,7 +114,7 @@ impl InputDefinition {
             return Err(LogicException(shirabe_php_shim::LogicException {
                 message: format!(
                     "An argument with name \"{}\" already exists.",
-                    PhpMixed::String(argument.get_name().to_string()),
+                    argument.get_name().to_string(),
                 ),
                 code: 0,
             })
@@ -125,8 +125,8 @@ impl InputDefinition {
             return Err(LogicException(shirabe_php_shim::LogicException {
                 message: format!(
                     "Cannot add a required argument \"{}\" after an array argument \"{}\".",
-                    PhpMixed::String(argument.get_name().to_string()),
-                    PhpMixed::String(last_array_argument.get_name().to_string()),
+                    argument.get_name().to_string(),
+                    last_array_argument.get_name().to_string(),
                 ),
                 code: 0,
             })
@@ -139,8 +139,8 @@ impl InputDefinition {
             return Err(LogicException(shirabe_php_shim::LogicException {
                 message: format!(
                     "Cannot add a required argument \"{}\" after an optional one \"{}\".",
-                    PhpMixed::String(argument.get_name().to_string()),
-                    PhpMixed::String(last_optional_argument.get_name().to_string()),
+                    argument.get_name().to_string(),
+                    last_optional_argument.get_name().to_string(),
                 ),
                 code: 0,
             })
@@ -168,7 +168,7 @@ impl InputDefinition {
         if !self.has_argument(name) {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!("The \"{}\" argument does not exist.", name.clone(),),
+                    message: format!("The \"{}\" argument does not exist.", name.clone()),
                     code: 0,
                 })
                 .into(),
@@ -262,7 +262,7 @@ impl InputDefinition {
             return Err(LogicException(shirabe_php_shim::LogicException {
                 message: format!(
                     "An option named \"{}\" already exists.",
-                    PhpMixed::String(option.get_name().to_string()),
+                    option.get_name().to_string(),
                 ),
                 code: 0,
             })
@@ -272,7 +272,7 @@ impl InputDefinition {
             return Err(LogicException(shirabe_php_shim::LogicException {
                 message: format!(
                     "An option named \"{}\" already exists.",
-                    PhpMixed::String(option.get_name().to_string()),
+                    option.get_name().to_string(),
                 ),
                 code: 0,
             })
@@ -287,7 +287,7 @@ impl InputDefinition {
                     return Err(LogicException(shirabe_php_shim::LogicException {
                         message: format!(
                             "An option with shortcut \"{}\" already exists.",
-                            PhpMixed::String(shortcut.clone()),
+                            shortcut.clone(),
                         ),
                         code: 0,
                     })
@@ -311,7 +311,7 @@ impl InputDefinition {
                 return Err(LogicException(shirabe_php_shim::LogicException {
                     message: format!(
                         "An option named \"{}\" already exists.",
-                        PhpMixed::String(negated_name.clone()),
+                        negated_name.clone(),
                     ),
                     code: 0,
                 })
@@ -329,10 +329,7 @@ impl InputDefinition {
         if !self.has_option(name) {
             return Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"--{}\" option does not exist.",
-                        PhpMixed::String(name.to_string()),
-                    ),
+                    message: format!("The \"--{}\" option does not exist.", name.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -384,10 +381,7 @@ impl InputDefinition {
         match self.shortcuts.get(shortcut) {
             None => Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"-{}\" option does not exist.",
-                        PhpMixed::String(shortcut.to_string()),
-                    ),
+                    message: format!("The \"-{}\" option does not exist.", shortcut.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -401,10 +395,7 @@ impl InputDefinition {
         match self.negations.get(negation) {
             None => Err(
                 InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
-                    message: format!(
-                        "The \"--{}\" option does not exist.",
-                        PhpMixed::String(negation.to_string()),
-                    ),
+                    message: format!("The \"--{}\" option does not exist.", negation.to_string()),
                     code: 0,
                 })
                 .into(),
@@ -425,37 +416,37 @@ impl InputDefinition {
                 if option.accept_value() {
                     value = format!(
                         " {}{}{}",
-                        PhpMixed::String(if option.is_value_optional() {
+                        if option.is_value_optional() {
                             "[".to_string()
                         } else {
                             String::new()
-                        }),
-                        PhpMixed::String(shirabe_php_shim::strtoupper(option.get_name())),
-                        PhpMixed::String(if option.is_value_optional() {
+                        },
+                        shirabe_php_shim::strtoupper(option.get_name()),
+                        if option.is_value_optional() {
                             "]".to_string()
                         } else {
                             String::new()
-                        }),
+                        },
                     );
                 }
 
                 let shortcut = match option.get_shortcut() {
                     Some(shortcut) => {
-                        format!("-{}|", PhpMixed::String(shortcut.to_string()))
+                        format!("-{}|", shortcut.to_string())
                     }
                     None => String::new(),
                 };
                 let negation = if option.is_negatable() {
-                    format!("|--no-{}", PhpMixed::String(option.get_name().to_string()),)
+                    format!("|--no-{}", option.get_name().to_string())
                 } else {
                     String::new()
                 };
                 elements.push(format!(
                     "[{}--{}{}{}]",
-                    PhpMixed::String(shortcut),
-                    PhpMixed::String(option.get_name().to_string()),
-                    PhpMixed::String(value),
-                    PhpMixed::String(negation),
+                    shortcut,
+                    option.get_name().to_string(),
+                    value,
+                    negation,
                 ));
             }
         }
diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
index c3a0262..747ac0e 100644
--- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs
@@ -125,7 +125,7 @@ impl StringInput {
                     InvalidArgumentException(shirabe_php_shim::InvalidArgumentException {
                         message: format!(
                             "Unable to parse input near \"... {} ...\".",
-                            PhpMixed::String(shirabe_php_shim::substr(input, cursor, Some(10),)),
+                            shirabe_php_shim::substr(input, cursor, Some(10)),
                         ),
                         code: 0,
                     })