aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe-symfony-console/src
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe-symfony-console/src
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
refactor(pcre): inline Preg into its call sites and drop the crate
Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe-symfony-console/src')
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/json_descriptor.rs7
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/markdown_descriptor.rs7
-rw-r--r--crates/shirabe-symfony-console/src/descriptor/text_descriptor.rs7
-rw-r--r--crates/shirabe-symfony-console/src/helper/table.rs9
4 files changed, 14 insertions, 16 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{}",
diff --git a/crates/shirabe-symfony-console/src/helper/table.rs b/crates/shirabe-symfony-console/src/helper/table.rs
index 06743dbf..acfcbfef 100644
--- a/crates/shirabe-symfony-console/src/helper/table.rs
+++ b/crates/shirabe-symfony-console/src/helper/table.rs
@@ -8,8 +8,7 @@ use crate::helper::{
};
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_match2};
/// A single cell within a table row.
///
@@ -656,10 +655,12 @@ 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::is_match(
+ let is_not_styled_by_tag = preg_match2(
php_regex!("/^<(\\w+|(\\w+=[\\w,]+;?)*)>.+<\\/(\\w+|(\\w+=\\w+;?)*)?>$/"),
&cell_str,
- );
+ 0,
+ )
+ .is_none();
if is_not_styled_by_tag {
let cell_style = cell.style().unwrap();
match cell_style.get_cell_format() {