aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests/installer_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/installer_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/installer_test.rs')
-rw-r--r--crates/shirabe/tests/installer_test.rs11
1 files changed, 5 insertions, 6 deletions
diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs
index 7b86be89..5503824e 100644
--- a/crates/shirabe/tests/installer_test.rs
+++ b/crates/shirabe/tests/installer_test.rs
@@ -42,8 +42,7 @@ use shirabe::util::r#loop::Loop;
use shirabe::util::platform::Platform;
use shirabe::util::process_executor::ProcessExecutor;
use shirabe_class_map_generator::class_map::ClassMap;
-use shirabe_pcre::preg::Preg;
-use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_match2, preg_replace, preg_split_delim_capture};
use shirabe_semver::VersionParser;
use shirabe_semver::constraint::AnyConstraint;
use shirabe_symfony_console::command::Command as SymfonyCommand;
@@ -692,7 +691,7 @@ fn load_integration_tests(path: &str) -> Vec<IntegrationCase> {
return;
}
if let Some(url) = repo.get("url").and_then(|u| u.as_str())
- && Preg::is_match(php_regex!(r"{^file://[^/]}"), url)
+ && preg_match2(php_regex!(r"{^file://[^/]}"), url, 0).is_some()
{
let new_url = format!("file://{}/{}", fixtures_str, &url[7..]);
repo["url"] = serde_json::Value::String(new_url);
@@ -1138,7 +1137,7 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
.unwrap();
assert!(
- Preg::is_match(r"{^(install|update)\b}", &case.run),
+ preg_match2(r"{^(install|update)\b}", &case.run, 0).is_some(),
"The run command only supports install and update"
);
@@ -1276,12 +1275,12 @@ fn do_test_integration(case: &IntegrationCase, expect_output: Option<&str>) {
if let Some(expect_output) = expect_output
&& !expect_output.is_empty()
{
- let output = Preg::replace(
+ let output = preg_replace(
php_regex!(r"{^ - .*?\.ini$}m"),
"__inilist__",
&output_string,
);
- let output = Preg::replace(
+ let output = preg_replace(
php_regex!(r"{(__inilist__\r?\n)+}"),
"__inilist__\n",
&output,