diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-18 01:57:02 +0900 |
| commit | 530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch) | |
| tree | b4de2c2443e2bb2cfc692454ac284dc1d2313e59 /Cargo.lock | |
| parent | 0caac63bacefb9a1f62848636d47fca07f592bba (diff) | |
| download | php-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 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 13 |
1 files changed, 0 insertions, 13 deletions
@@ -2106,7 +2106,6 @@ dependencies = [ "shirabe-ca-bundle", "shirabe-class-map-generator", "shirabe-metadata-minifier", - "shirabe-pcre", "shirabe-php-rpc", "shirabe-php-shim", "shirabe-seld-json-lint", @@ -2136,7 +2135,6 @@ version = "0.0.1" dependencies = [ "anyhow", "indexmap", - "shirabe-pcre", "shirabe-php-rpc", "shirabe-php-shim", "shirabe-symfony-finder", @@ -2151,15 +2149,6 @@ dependencies = [ ] [[package]] -name = "shirabe-pcre" -version = "0.0.1" -dependencies = [ - "indexmap", - "regex", - "shirabe-php-shim", -] - -[[package]] name = "shirabe-php-rpc" version = "0.0.1" dependencies = [ @@ -2239,7 +2228,6 @@ dependencies = [ "anyhow", "indexmap", "regex", - "shirabe-pcre", "shirabe-php-shim", "shirabe-symfony-process", "shirabe-symfony-string", @@ -2262,7 +2250,6 @@ dependencies = [ "chrono", "indexmap", "regex", - "shirabe-pcre", "shirabe-php-shim", ] |