diff options
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console/command')
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/command/command.rs | 11 | ||||
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/command/complete_command.rs | 3 |
2 files changed, 6 insertions, 8 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 89f4ae2..527f0c5 100644 --- a/crates/shirabe-external-packages/src/symfony/console/command/command.rs +++ b/crates/shirabe-external-packages/src/symfony/console/command/command.rs @@ -406,7 +406,7 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny { self.merge_application_definition(true); // bind the input against the command specific arguments/options - match input.borrow_mut().bind(&*self.get_definition()) { + match input.borrow_mut().bind(&self.get_definition()) { Ok(()) => {} Err(e) => { if !self.get_ignore_validation_errors() { @@ -458,17 +458,16 @@ pub trait Command: std::fmt::Debug + shirabe_php_shim::AsAny { input.borrow_mut().validate()?; - let status_code: PhpMixed; - if self.get_code().is_some() { + let status_code: PhpMixed = if self.get_code().is_some() { let code = self.get_code(); let code = code.as_ref().unwrap(); - status_code = code(&mut *input.borrow_mut(), &mut *output.borrow_mut()); + code(&mut *input.borrow_mut(), &mut *output.borrow_mut()) } else { let executed = self.execute(input.clone(), output.clone())?; - status_code = PhpMixed::from(executed); // PHP also raises \TypeError when execute() does not return int; in this // strongly-typed port execute() already returns an int, so the check is moot. - } + PhpMixed::from(executed) + }; // is_numeric($statusCode) ? (int) $statusCode : 0 Ok(shirabe_php_shim::is_numeric_to_int(&status_code)) 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 da59a75..3ed968e 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 @@ -1,7 +1,6 @@ //! ref: composer/vendor/symfony/console/Command/CompleteCommand.php use indexmap::IndexMap; -use shirabe_php_shim::AsAny; use shirabe_php_shim::PhpMixed; use std::cell::RefCell; use std::ops::{Deref, DerefMut}; @@ -327,7 +326,7 @@ impl Command for CompleteCommand { } Some(command) => { command.borrow().merge_application_definition(false); - completion_input.bind(&*command.borrow().get_definition())?; + completion_input.bind(&command.borrow().get_definition())?; if CompletionInput::TYPE_OPTION_NAME == completion_input.get_completion_type() { self.log(&format!( |
