aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/question
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe-symfony-console/src/question')
-rw-r--r--crates/shirabe-symfony-console/src/question/choice_question.rs8
-rw-r--r--crates/shirabe-symfony-console/src/question/confirmation_question.rs5
2 files changed, 5 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 b8ac16d8..84cba360 100644
--- a/crates/shirabe-symfony-console/src/question/choice_question.rs
+++ b/crates/shirabe-symfony-console/src/question/choice_question.rs
@@ -122,12 +122,12 @@ impl ChoiceQuestion {
let selected_choices: Vec<PhpMixed> = if multiselect {
// Check for a separated comma values
- let mut matches: Vec<Option<String>> = Vec::new();
- if !preg_match(
+ if preg_match(
php_regex!("/^[^,]+(?:,[^,]+)*$/"),
&shirabe_php_shim::strval(&selected),
- &mut matches,
- ) {
+ )
+ .is_none()
+ {
return Err(InvalidArgumentException::new(shirabe_php_shim::sprintf(
&error_message,
std::slice::from_ref(&selected),
diff --git a/crates/shirabe-symfony-console/src/question/confirmation_question.rs b/crates/shirabe-symfony-console/src/question/confirmation_question.rs
index 6ec9281f..5a18a045 100644
--- a/crates/shirabe-symfony-console/src/question/confirmation_question.rs
+++ b/crates/shirabe-symfony-console/src/question/confirmation_question.rs
@@ -38,10 +38,7 @@ impl ConfirmationQuestion {
return answer;
}
- let answer_is_true = {
- let mut matches: Vec<Option<String>> = Vec::new();
- preg_match(&regex, &shirabe_php_shim::strval(&answer), &mut matches)
- };
+ let answer_is_true = preg_match(&regex, &shirabe_php_shim::strval(&answer)).is_some();
// false === $default
if matches!(default, PhpMixed::Bool(false)) {