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.rs4
2 files changed, 5 insertions, 7 deletions
diff --git a/crates/shirabe-symfony-console/src/question/choice_question.rs b/crates/shirabe-symfony-console/src/question/choice_question.rs
index 84cba360..a29fdf2a 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, preg_match};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match};
/// Represents a choice question.
#[derive(Debug)]
@@ -122,12 +122,10 @@ impl ChoiceQuestion {
let selected_choices: Vec<PhpMixed> = if multiselect {
// Check for a separated comma values
- if preg_match(
+ if !preg_is_match(
php_regex!("/^[^,]+(?:,[^,]+)*$/"),
&shirabe_php_shim::strval(&selected),
- )
- .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 5a18a045..6b8eb389 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, preg_match};
+use shirabe_php_shim::{PhpMixed, preg_is_match};
/// Represents a yes/no question.
#[derive(Debug)]
@@ -38,7 +38,7 @@ impl ConfirmationQuestion {
return answer;
}
- let answer_is_true = preg_match(&regex, &shirabe_php_shim::strval(&answer)).is_some();
+ let answer_is_true = preg_is_match(&regex, &shirabe_php_shim::strval(&answer));
// false === $default
if matches!(default, PhpMixed::Bool(false)) {