diff options
Diffstat (limited to 'crates/shirabe-symfony-console/src/question')
| -rw-r--r-- | crates/shirabe-symfony-console/src/question/choice_question.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe-symfony-console/src/question/confirmation_question.rs | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/crates/shirabe-symfony-console/src/question/choice_question.rs b/crates/shirabe-symfony-console/src/question/choice_question.rs index 8c0bafc3..b8ac16d8 100644 --- a/crates/shirabe-symfony-console/src/question/choice_question.rs +++ b/crates/shirabe-symfony-console/src/question/choice_question.rs @@ -5,7 +5,7 @@ use crate::exception::LogicException; use crate::question::Question; use crate::question::QuestionInterface; use indexmap::IndexMap; -use shirabe_php_shim::{PhpMixed, php_regex}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_match}; /// Represents a choice question. #[derive(Debug)] @@ -123,7 +123,7 @@ impl ChoiceQuestion { let selected_choices: Vec<PhpMixed> = if multiselect { // Check for a separated comma values let mut matches: Vec<Option<String>> = Vec::new(); - if !shirabe_php_shim::preg_match( + if !preg_match( php_regex!("/^[^,]+(?:,[^,]+)*$/"), &shirabe_php_shim::strval(&selected), &mut matches, diff --git a/crates/shirabe-symfony-console/src/question/confirmation_question.rs b/crates/shirabe-symfony-console/src/question/confirmation_question.rs index 65dd19ab..6ec9281f 100644 --- a/crates/shirabe-symfony-console/src/question/confirmation_question.rs +++ b/crates/shirabe-symfony-console/src/question/confirmation_question.rs @@ -3,7 +3,7 @@ use crate::exception::InvalidArgumentException; use crate::question::Question; use crate::question::QuestionInterface; -use shirabe_php_shim::PhpMixed; +use shirabe_php_shim::{PhpMixed, preg_match}; /// Represents a yes/no question. #[derive(Debug)] @@ -40,11 +40,7 @@ impl ConfirmationQuestion { let answer_is_true = { let mut matches: Vec<Option<String>> = Vec::new(); - shirabe_php_shim::preg_match( - ®ex, - &shirabe_php_shim::strval(&answer), - &mut matches, - ) + preg_match(®ex, &shirabe_php_shim::strval(&answer), &mut matches) }; // false === $default |
