2 files changed, 24 insertions, 35 deletions

diff --git a/crates/shirabe-external-packages/src/symfony/console/command/command.rs b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
index ca61717d..a1636848 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/command.rs
@@ -138,12 +138,10 @@ impl CommandData {
         let mut matches: Vec<Option<String>> = Vec::new();
         if !shirabe_php_shim::preg_match(php_regex!(r"/^[^\:]++(\:[^\:]++)*$/"), name, &mut matches)
         {
-            return Ok(Err(InvalidArgumentException(
-                shirabe_php_shim::InvalidArgumentException {
-                    message: format!("Command name \"{}\" is invalid.", name),
-                    code: 0,
-                },
-            )));
+            return Ok(Err(InvalidArgumentException::new(format!(
+                "Command name \"{}\" is invalid.",
+                name
+            ))));
         }
 
         Ok(Ok(()))
@@ -847,14 +845,11 @@ impl Command for CommandData {
         let helper_set = match &*helper_set_ref {
             None => {
                 return Ok(Err(
-                    crate::symfony::console::exception::logic_exception::LogicException(
-                        shirabe_php_shim::LogicException {
-                            message: format!(
-                                "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.",
-                                name
-                            ),
-                            code: 0,
-                        },
+                    crate::symfony::console::exception::logic_exception::LogicException::new(
+                        format!(
+                            "Cannot retrieve helper \"{}\" because there is no HelperSet defined. Did you forget to add your command to the application or to set the application on the command using the setApplication() method? You can also set the HelperSet directly using the setHelperSet() method.",
+                            name
+                        ),
                     ),
                 ));
             }
diff --git a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
index cc8747ec..5854e248 100644
--- a/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
+++ b/crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs
@@ -81,11 +81,9 @@ impl CompleteCommand {
     ) -> anyhow::Result<CompletionInput> {
         let current_index = input.get_option("current")?;
         if !current_index.to_bool() || !shirabe_php_shim::ctype_digit(&current_index.to_string()) {
-            anyhow::bail!(shirabe_php_shim::RuntimeException {
-                message: "The \"--current\" option must be set and it must be an integer."
-                    .to_string(),
-                code: 0,
-            });
+            anyhow::bail!(shirabe_php_shim::RuntimeException::new(
+                "The \"--current\" option must be set and it must be an integer.".to_string()
+            ));
         }
 
         let tokens: Vec<String> = match input.get_option("input")?.as_list() {
@@ -251,10 +249,9 @@ impl Command for CompleteCommand {
 
             let shell = input.borrow().get_option("shell")?;
             if !shell.to_bool() {
-                anyhow::bail!(shirabe_php_shim::RuntimeException {
-                    message: "The \"--shell\" option must be set.".to_string(),
-                    code: 0,
-                });
+                anyhow::bail!(shirabe_php_shim::RuntimeException::new(
+                    "The \"--shell\" option must be set.".to_string()
+                ));
             }
 
             let completion_output = self
@@ -263,18 +260,15 @@ impl Command for CompleteCommand {
                 .cloned()
                 .unwrap_or(PhpMixed::Bool(false));
             if !completion_output.to_bool() {
-                anyhow::bail!(shirabe_php_shim::RuntimeException {
-                    message: format!(
-                        "Shell completion is not supported for your shell: \"{}\" (supported: \"{}\").",
-                        shell,
-                        self.completion_outputs
-                            .keys()
-                            .cloned()
-                            .collect::<Vec<_>>()
-                            .join("\", \"")
-                    ),
-                    code: 0,
-                });
+                anyhow::bail!(shirabe_php_shim::RuntimeException::new(format!(
+                    "Shell completion is not supported for your shell: \"{}\" (supported: \"{}\").",
+                    shell,
+                    self.completion_outputs
+                        .keys()
+                        .cloned()
+                        .collect::<Vec<_>>()
+                        .join("\", \"")
+                )));
             }
 
             let mut completion_input = self.create_completion_input(&*input.borrow())?;