aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/all_functional_test.rs
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/all_functional_test.rs
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/all_functional_test.rs')
-rw-r--r--crates/shirabe/tests/all_functional_test.rs15
1 files changed, 9 insertions, 6 deletions
diff --git a/crates/shirabe/tests/all_functional_test.rs b/crates/shirabe/tests/all_functional_test.rs
index d947a054..36137955 100644
--- a/crates/shirabe/tests/all_functional_test.rs
+++ b/crates/shirabe/tests/all_functional_test.rs
@@ -8,8 +8,7 @@
use indexmap::IndexMap;
use serial_test::serial;
use shirabe::util::filesystem::Filesystem;
-use shirabe_pcre::preg::Preg;
-use shirabe_php_shim::{PhpMixed, intval, php_regex, preg_split_delim_capture};
+use shirabe_php_shim::{PhpMixed, intval, php_regex, preg_match2, preg_split_delim_capture};
use std::path::{Path, PathBuf};
/// ref: AllFunctionalTest's `$oldcwd` / `$testDir` instance state plus its `setUp`/`tearDown`.
@@ -141,13 +140,13 @@ fn expect_matches(expected: &str, output: &str) {
line += 1;
}
if eb[i] == b'%' {
- let Some(m) = Preg::is_match3(php_regex!("{%(.+?)%}"), &expected[i..]) else {
+ let Some(m) = preg_match2(php_regex!("{%(.+?)%}"), &expected[i..], 0) else {
panic!("Failed to match %...% in {}", &expected[i..]);
};
let regex = m.get(1).map(str::to_string).unwrap();
let pattern = format!("{{{}}}", regex);
- if let Some(m) = Preg::is_match3(&pattern, &output[j..]) {
+ if let Some(m) = preg_match2(&pattern, &output[j..], 0) {
let full = m.get(0).map(str::to_string).unwrap();
i += regex.len() + 2;
j += full.len();
@@ -222,12 +221,16 @@ fn run_integration(test_filename: &str) {
expect_matches(expected, output);
}
if let Some(expect_regex) = test_data.get("EXPECT-REGEX") {
- assert!(Preg::is_match(expect_regex, &clean_output(&raw_output)));
+ assert!(preg_match2(expect_regex, &clean_output(&raw_output), 0).is_some());
}
if let Some(expect_regexes) = test_data.get("EXPECT-REGEXES") {
let clean = clean_output(&raw_output);
for regex in expect_regexes.split('\n') {
- assert!(Preg::is_match(regex, &clean), "Output: {}", raw_output);
+ assert!(
+ preg_match2(regex, &clean, 0).is_some(),
+ "Output: {}",
+ raw_output
+ );
}
}
if let Some(expect_exit_code) = test_data.get("EXPECT-EXIT-CODE") {