diff options
Diffstat (limited to 'crates/shirabe-symfony-console/src/descriptor')
3 files changed, 9 insertions, 12 deletions
diff --git a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs index a195dc01..53941663 100644 --- a/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs @@ -10,8 +10,7 @@ use crate::input::InputDefinition; use crate::input::InputOption; use crate::output::OutputInterface; use indexmap::IndexMap; -use shirabe_pcre::preg::Preg; -use shirabe_php_shim::{PhpMixed, php_regex}; +use shirabe_php_shim::{PhpMixed, php_regex, preg_replace}; /// JSON descriptor. /// @@ -160,7 +159,7 @@ impl JsonDescriptor { data.insert("is_array".to_string(), PhpMixed::Bool(argument.is_array())); data.insert( "description".to_string(), - PhpMixed::String(Preg::replace( + PhpMixed::String(preg_replace( php_regex!("/\\s*[\\r\\n]\\s*/"), " ", argument.get_description(), @@ -221,7 +220,7 @@ impl JsonDescriptor { data.insert("is_multiple".to_string(), PhpMixed::Bool(option.is_array())); data.insert( "description".to_string(), - PhpMixed::String(Preg::replace( + PhpMixed::String(preg_replace( php_regex!("/\\s*[\\r\\n]\\s*/"), " ", option.get_description(), diff --git a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs index 8c814bb5..d6285468 100644 --- a/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs @@ -11,8 +11,7 @@ use crate::input::InputDefinition; use crate::input::InputOption; use crate::output::OutputInterface; use indexmap::IndexMap; -use shirabe_pcre::preg::Preg; -use shirabe_php_shim::PhpMixed; +use shirabe_php_shim::{PhpMixed, preg_replace}; /// Markdown descriptor. /// @@ -55,7 +54,7 @@ impl MarkdownDescriptor { if !argument.get_description().is_empty() { format!( "{}\n\n", - Preg::replace("/\\s*[\\r\\n]\\s*/", "\n", argument.get_description()) + preg_replace("/\\s*[\\r\\n]\\s*/", "\n", argument.get_description()) ) } else { String::new() @@ -93,7 +92,7 @@ impl MarkdownDescriptor { if !option.get_description().is_empty() { format!( "{}\n\n", - Preg::replace("/\\s*[\\r\\n]\\s*/", "\n", option.get_description()) + preg_replace("/\\s*[\\r\\n]\\s*/", "\n", option.get_description()) ) } else { String::new() diff --git a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs index 0308415f..8783ef5e 100644 --- a/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs +++ b/crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs @@ -12,8 +12,7 @@ use crate::input::InputDefinition; use crate::input::InputOption; use crate::output::OutputInterface; use indexmap::IndexMap; -use shirabe_pcre::preg::Preg; -use shirabe_php_shim::PhpMixed; +use shirabe_php_shim::{PhpMixed, preg_replace}; /// Text descriptor. /// @@ -63,7 +62,7 @@ impl TextDescriptor { argument.get_name(), shirabe_php_shim::str_repeat(" ", spacing_width as usize), // + 4 = 2 spaces before <info>, 2 spaces after </info> - Preg::replace( + preg_replace( "/\\s*[\\r\\n]\\s*/", &format!( "\n{}", @@ -131,7 +130,7 @@ impl TextDescriptor { synopsis, shirabe_php_shim::str_repeat(" ", spacing_width as usize), // + 4 = 2 spaces before <info>, 2 spaces after </info> - Preg::replace( + preg_replace( "/\\s*[\\r\\n]\\s*/", &format!( "\n{}", |