aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/package
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/tests/package
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/tests/package')
-rw-r--r--crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs9
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs
index 499e08dc..d932dd4e 100644
--- a/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs
+++ b/crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs
@@ -3,8 +3,9 @@
use indexmap::IndexMap;
use shirabe::package::archiver::ArchivableFilesFinder;
use shirabe::util::Filesystem;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::{PhpMixed, ZipArchive, dirname, file_put_contents, preg_quote};
+use shirabe_php_shim::{
+ PhpMixed, ZipArchive, dirname, file_put_contents, preg_quote, preg_replace,
+};
use shirabe_symfony_process::Process;
use tempfile::TempDir;
@@ -85,7 +86,7 @@ fn get_archivable_files(set_up: &SetUp, finder: ArchivableFilesFinder) -> Vec<St
for file in finder {
if !file.is_dir() {
let real_path = file.canonicalize().unwrap();
- files.push(Preg::replace(
+ files.push(preg_replace(
format!("#^{}#", preg_quote(&set_up.sources, Some('#'))),
"",
&set_up.fs.normalize_path(&real_path.to_string_lossy()),
@@ -196,7 +197,7 @@ fn get_archived_files(set_up: &SetUp, command: &str) -> Vec<String> {
continue;
}
let virtual_path = format!("phar://{}/archive.zip/{}", set_up.sources, name);
- files.push(Preg::replace(
+ files.push(preg_replace(
&prefix,
"",
&set_up.fs.normalize_path(&virtual_path),