aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src/helper
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe-symfony-console/src/helper')
-rw-r--r--crates/shirabe-symfony-console/src/helper/helper.rs6
-rw-r--r--crates/shirabe-symfony-console/src/helper/table.rs7
2 files changed, 6 insertions, 7 deletions
diff --git a/crates/shirabe-symfony-console/src/helper/helper.rs b/crates/shirabe-symfony-console/src/helper/helper.rs
index 435648ca..a740964a 100644
--- a/crates/shirabe-symfony-console/src/helper/helper.rs
+++ b/crates/shirabe-symfony-console/src/helper/helper.rs
@@ -2,7 +2,7 @@
use crate::formatter::OutputFormatterInterface;
use crate::helper::HelperSet;
-use shirabe_php_shim::{php_regex, preg_match, preg_replace};
+use shirabe_php_shim::{php_regex, preg_is_match, preg_replace};
use shirabe_symfony_string::unicode_string::UnicodeString;
/// Helper is the base class for all helper classes.
@@ -40,7 +40,7 @@ impl Helper {
/// Returns the width of a string, using mb_strwidth if it is available.
/// The width is how many characters positions the string will use.
pub fn width(string: &str) -> i64 {
- if preg_match(php_regex!("//u"), string).is_some() {
+ if preg_is_match(php_regex!("//u"), string) {
return UnicodeString::new(string).width(false);
}
@@ -56,7 +56,7 @@ impl Helper {
/// Returns the length of a string, using mb_strlen if it is available.
/// The length is related to how many bytes the string will use.
pub fn length(string: &str) -> i64 {
- if preg_match(php_regex!("//u"), string).is_some() {
+ if preg_is_match(php_regex!("//u"), string) {
return UnicodeString::new(string).length();
}
diff --git a/crates/shirabe-symfony-console/src/helper/table.rs b/crates/shirabe-symfony-console/src/helper/table.rs
index 777f44c7..e9ea12c8 100644
--- a/crates/shirabe-symfony-console/src/helper/table.rs
+++ b/crates/shirabe-symfony-console/src/helper/table.rs
@@ -8,7 +8,7 @@ use crate::helper::{
};
use crate::output::OutputInterface;
use indexmap::IndexMap;
-use shirabe_php_shim::{PhpMixed, php_regex, preg_match};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_is_match};
/// A single cell within a table row.
///
@@ -655,11 +655,10 @@ impl Table {
let mut cell_format = cell_format;
let mut pad_type = style.get_pad_type();
if cell.is_table_cell() && cell.style().is_some() {
- let is_not_styled_by_tag = preg_match(
+ let is_not_styled_by_tag = !preg_is_match(
php_regex!("/^<(\\w+|(\\w+=[\\w,]+;?)*)>.+<\\/(\\w+|(\\w+=\\w+;?)*)?>$/"),
&cell_str,
- )
- .is_none();
+ );
if is_not_styled_by_tag {
let cell_style = cell.style().unwrap();
match cell_style.get_cell_format() {