aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/tests
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
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')
-rw-r--r--crates/shirabe/tests/all_functional_test.rs15
-rw-r--r--crates/shirabe/tests/common/io_mock.rs5
-rw-r--r--crates/shirabe/tests/dependency_resolver/pool_builder_test.rs5
-rw-r--r--crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs5
-rw-r--r--crates/shirabe/tests/installer_test.rs11
-rw-r--r--crates/shirabe/tests/package/archiver/archivable_files_finder_test.rs9
6 files changed, 25 insertions, 25 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") {
diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs
index c1bd5e00..7aaa231a 100644
--- a/crates/shirabe/tests/common/io_mock.rs
+++ b/crates/shirabe/tests/common/io_mock.rs
@@ -5,8 +5,7 @@ use shirabe::io::buffer_io::BufferIO;
use shirabe::io::io_interface;
use shirabe::io::{IOInterface, IOInterfaceImmutable, IOInterfaceMutable};
use shirabe::util::platform::Platform;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote, preg_split};
+use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_match2, preg_quote, preg_split};
use shirabe_symfony_console::output::output_interface;
use std::collections::VecDeque;
@@ -167,7 +166,7 @@ impl IOMock {
};
while let Some(line) = lines.pop_front() {
- if Preg::is_match(&pattern, &line) {
+ if preg_match2(&pattern, &line, 0).is_some() {
continue 'expects;
}
diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
index a4d118ee..27359fa3 100644
--- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
+++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
@@ -19,8 +19,7 @@ use shirabe::repository::handle::{LockArrayRepositoryHandle, RepositoryInterface
use shirabe::repository::lock_array_repository::LockArrayRepository;
use shirabe::repository::repository_factory::RepositoryFactory;
use shirabe::repository::repository_set::{RepositorySet, RootAliasInput};
-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_split_delim_capture};
use std::path::PathBuf;
/// Maps the PHP `$loadPackage` closure: pops the optional `id` from the data, loads the
@@ -138,7 +137,7 @@ fn get_integration_tests(fixtures_dir: &std::path::Path) -> IndexMap<String, Int
for file in files {
let file = file.to_str().unwrap().to_string();
- if !Preg::is_match(php_regex!(r"/\.test$/"), &file) {
+ if preg_match2(php_regex!(r"/\.test$/"), &file, 0).is_none() {
continue;
}
diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
index 8c08e1c0..cac8189d 100644
--- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
+++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
@@ -11,8 +11,7 @@ use shirabe::package::loader::{ArrayLoader, LoaderInterface};
use shirabe::package::version::version_parser::VersionParser;
use shirabe::repository::handle::LockArrayRepositoryHandle;
use shirabe::repository::lock_array_repository::LockArrayRepository;
-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_split_delim_capture};
use std::path::PathBuf;
fn load_package(package_data: &PhpMixed) -> BasePackageHandle {
@@ -141,7 +140,7 @@ fn provide_integration_tests() -> IndexMap<
for file in files {
let file = file.to_str().unwrap().to_string();
- if !Preg::is_match(php_regex!(r"/\.test$/"), &file) {
+ if preg_match2(php_regex!(r"/\.test$/"), &file, 0).is_none() {
continue;
}
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,
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),