refactor(preg): replace Preg::split*() with shim preg_split*()

preg_split2()'s limit was always -1 and its flags were always either 0 or
PREG_SPLIT_DELIM_CAPTURE alone, so both arguments are gone: the shim now
exposes preg_split() and preg_split_delim_capture() over a shared
preg_split_impl(). That leaves Preg::split()/split4() as bare
pass-throughs, so callers use the shim functions directly and the wrappers
are dropped along with the now-unreferenced PREG_SPLIT_* constants.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

18 files changed, 54 insertions, 107 deletions

diff --git a/crates/shirabe-pcre/src/preg.rs b/crates/shirabe-pcre/src/preg.rs
index 55388a9f..f45b86df 100644
--- a/crates/shirabe-pcre/src/preg.rs
+++ b/crates/shirabe-pcre/src/preg.rs
@@ -14,9 +14,9 @@
 use indexmap::IndexMap;
 pub use shirabe_php_shim::CaptureKey;
 use shirabe_php_shim::{
-    PREG_OFFSET_CAPTURE, PREG_SET_ORDER, PREG_SPLIT_OFFSET_CAPTURE, PREG_UNMATCHED_AS_NULL,
-    PregPattern, preg_grep, preg_match_all_offset_capture, preg_match_all2, preg_match2,
-    preg_replace_callback, preg_replace2, preg_split2,
+    PREG_OFFSET_CAPTURE, PREG_SET_ORDER, PREG_UNMATCHED_AS_NULL, PregPattern, preg_grep,
+    preg_match_all_offset_capture, preg_match_all2, preg_match2, preg_replace_callback,
+    preg_replace2,
 };
 
 #[derive(Debug)]
@@ -120,19 +120,6 @@ impl Preg {
         preg_replace_callback(pattern, adapter, subject).expect("$replacement cannot fail")
     }
 
-    pub fn split(pattern: impl PregPattern, subject: &str) -> Vec<String> {
-        Self::split4(pattern, subject, -1, 0)
-    }
-
-    pub fn split4(pattern: impl PregPattern, subject: &str, limit: i64, flags: i64) -> Vec<String> {
-        assert!(
-            flags & PREG_SPLIT_OFFSET_CAPTURE == 0,
-            "PREG_SPLIT_OFFSET_CAPTURE is not supported as it changes the type of $matches, use splitWithOffsets() instead"
-        );
-
-        preg_split2(pattern, subject, limit, flags)
-    }
-
     pub fn grep<T: AsRef<str>>(
         pattern: impl PregPattern,
         array: impl IntoIterator<Item = T>,
diff --git a/crates/shirabe-php-shim/src/preg.rs b/crates/shirabe-php-shim/src/preg.rs
index c762cb95..6d70c717 100644
--- a/crates/shirabe-php-shim/src/preg.rs
+++ b/crates/shirabe-php-shim/src/preg.rs
@@ -5,9 +5,6 @@ pub const PREG_PATTERN_ORDER: i64 = 1;
 pub const PREG_SET_ORDER: i64 = 2;
 pub const PREG_OFFSET_CAPTURE: i64 = 256;
 pub const PREG_UNMATCHED_AS_NULL: i64 = 512;
-pub const PREG_SPLIT_NO_EMPTY: i64 = 1;
-pub const PREG_SPLIT_DELIM_CAPTURE: i64 = 2;
-pub const PREG_SPLIT_OFFSET_CAPTURE: i64 = 4;
 
 #[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
 pub enum CaptureKey {
@@ -208,52 +205,34 @@ pub fn preg_grep<T: AsRef<str>>(
 }
 
 pub fn preg_split(pattern: impl PregPattern, subject: &str) -> Vec<String> {
-    preg_split2(pattern, subject, -1, 0)
+    preg_split_impl(pattern, subject, false)
 }
 
-pub fn preg_split2(
-    pattern: impl PregPattern,
-    subject: &str,
-    limit: i64,
-    flags: i64,
-) -> Vec<String> {
+pub fn preg_split_delim_capture(pattern: impl PregPattern, subject: &str) -> Vec<String> {
+    preg_split_impl(pattern, subject, true)
+}
+
+fn preg_split_impl(pattern: impl PregPattern, subject: &str, delim_capture: bool) -> Vec<String> {
     let __resolved = pattern.resolve();
     let (re, _anchored) = __resolved.parts();
-    let no_empty = flags & PREG_SPLIT_NO_EMPTY != 0;
-    let delim_capture = flags & PREG_SPLIT_DELIM_CAPTURE != 0;
-    // `limit` counts the resulting pieces; a non-positive value means no limit.
-    let max_delims = if limit > 0 {
-        (limit as usize).saturating_sub(1)
-    } else {
-        usize::MAX
-    };
 
     let mut result: Vec<String> = Vec::new();
-    let push = |s: &str, result: &mut Vec<String>| {
-        if !(no_empty && s.is_empty()) {
-            result.push(s.to_string());
-        }
-    };
-
     let mut last = 0usize;
-    for (delims, caps) in re.captures_iter(subject).enumerate() {
-        if delims >= max_delims {
-            break;
-        }
+    for caps in re.captures_iter(subject) {
         let m = caps.get(0).unwrap();
-        push(&subject[last..m.start()], &mut result);
+        result.push(subject[last..m.start()].to_string());
         if delim_capture {
             // Mirror preg_match: trailing unmatched groups are dropped, interior
             // unmatched groups are emitted as "".
             if let Some(last_g) = (1..caps.len()).rev().find(|&g| caps.get(g).is_some()) {
                 for g in 1..=last_g {
-                    push(caps.get(g).map(|x| x.as_str()).unwrap_or(""), &mut result);
+                    result.push(caps.get(g).map(|x| x.as_str()).unwrap_or("").to_string());
                 }
             }
         }
         last = m.end();
     }
-    push(&subject[last..], &mut result);
+    result.push(subject[last..].to_string());
 
     result
 }
diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs
index af25eb29..21375141 100644
--- a/crates/shirabe/src/command/global_command.rs
+++ b/crates/shirabe/src/command/global_command.rs
@@ -9,7 +9,9 @@ use crate::factory::Factory;
 use crate::util::Filesystem;
 use crate::util::Platform;
 use shirabe_pcre::Preg;
-use shirabe_php_shim::{LogicException, RuntimeException, chdir, impl_php_class, php_regex};
+use shirabe_php_shim::{
+    LogicException, RuntimeException, chdir, impl_php_class, php_regex, preg_split,
+};
 use shirabe_symfony_console::command::Command;
 use shirabe_symfony_console::completion::CompletionInput;
 use shirabe_symfony_console::completion::{CompletionSuggestions, StringOrSuggestion};
@@ -223,7 +225,7 @@ impl Command for GlobalCommand {
         input: std::rc::Rc<std::cell::RefCell<dyn InputInterface>>,
         output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>,
     ) -> anyhow::Result<i64> {
-        let tokens = Preg::split(
+        let tokens = preg_split(
             php_regex!(r"{\s+}"),
             &Self::input_to_string(&*input.borrow())?,
         );
diff --git a/crates/shirabe/src/downloader/fossil_downloader.rs b/crates/shirabe/src/downloader/fossil_downloader.rs
index b5e3cb7c..cdc5f268 100644
--- a/crates/shirabe/src/downloader/fossil_downloader.rs
+++ b/crates/shirabe/src/downloader/fossil_downloader.rs
@@ -13,7 +13,7 @@ use crate::util::Filesystem;
 use crate::util::ProcessExecutor;
 use indexmap::IndexMap;
 use shirabe_pcre::Preg;
-use shirabe_php_shim::{PhpMixed, RuntimeException, impl_php_class, php_regex};
+use shirabe_php_shim::{PhpMixed, RuntimeException, impl_php_class, php_regex, preg_split};
 
 #[derive(Debug)]
 pub struct FossilDownloader {
@@ -223,7 +223,7 @@ impl VcsDownloader for FossilDownloader {
         let lines: Vec<String> = if trimmed.is_empty() {
             vec![]
         } else {
-            Preg::split(php_regex!(r"{\r?\n}"), &trimmed)
+            preg_split(php_regex!(r"{\r?\n}"), &trimmed)
         };
 
         for line in lines {
diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs
index 7aeea252..90a962a2 100644
--- a/crates/shirabe/src/downloader/git_downloader.rs
+++ b/crates/shirabe/src/downloader/git_downloader.rs
@@ -20,8 +20,8 @@ use indexmap::IndexMap;
 use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{
     CmpOp, PhpMixed, RuntimeException, array_map, basename, dirname, impl_php_class, implode,
-    in_array_strict, is_dir, php_regex, preg_quote, realpath, rtrim, strlen, strpos, substr, trim,
-    version_compare,
+    in_array_strict, is_dir, php_regex, preg_quote, preg_split, realpath, rtrim, strlen, strpos,
+    substr, trim, version_compare,
 };
 
 #[derive(Debug)]
@@ -1200,7 +1200,7 @@ impl VcsDownloader for GitDownloader {
 
         let changes: Vec<String> = array_map(
             |elem: &String| format!("    {}", elem),
-            &Preg::split(php_regex!(r"{\s*\r?\n\s*}"), &changes),
+            &preg_split(php_regex!(r"{\s*\r?\n\s*}"), &changes),
         );
         self.inner.io.write_error3(
             &format!(
diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs
index 1487a710..d5087d10 100644
--- a/crates/shirabe/src/downloader/svn_downloader.rs
+++ b/crates/shirabe/src/downloader/svn_downloader.rs
@@ -17,7 +17,8 @@ use crate::util::Svn as SvnUtil;
 use indexmap::IndexMap;
 use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{
-    CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, version_compare,
+    CmpOp, PhpMixed, RuntimeException, impl_php_class, is_dir, php_regex, preg_split,
+    version_compare,
 };
 
 #[derive(Debug)]
@@ -271,7 +272,7 @@ impl VcsDownloader for SvnDownloader {
         }
 
         let changes_str = changes.unwrap();
-        let changes: Vec<String> = Preg::split(php_regex!(r"{\s*\r?\n\s*}"), &changes_str)
+        let changes: Vec<String> = preg_split(php_regex!(r"{\s*\r?\n\s*}"), &changes_str)
             .into_iter()
             .map(|elem| format!("    {}", elem))
             .collect();
diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs
index 3dd104ca..e3b35349 100644
--- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs
+++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs
@@ -2,8 +2,7 @@
 
 use crate::package::archiver::BaseExcludeFilter;
 use crate::package::archiver::BaseExcludeFilterBase;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::php_regex;
+use shirabe_php_shim::{php_regex, preg_split};
 use std::path::Path;
 
 pub struct GitExcludeFilter {
@@ -36,7 +35,7 @@ impl GitExcludeFilter {
     }
 
     fn parse_git_attributes_line_static(line: &str) -> Option<(String, bool, bool)> {
-        let parts = Preg::split(php_regex!(r"#\s+#"), line);
+        let parts = preg_split(php_regex!(r"#\s+#"), line);
 
         if parts.len() == 2 && parts[1] == "export-ignore" {
             return Some(BaseExcludeFilterBase::generate_pattern(&parts[0]));
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 0ee355f0..58a06ebd 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -17,7 +17,7 @@ use crate::util::ProcessExecutor;
 use indexmap::IndexMap;
 use shirabe_pcre::{CaptureKey, Preg};
 use shirabe_php_shim::{
-    PhpMixed, RuntimeException, UnexpectedValueException, php_regex, strtolower,
+    PhpMixed, RuntimeException, UnexpectedValueException, php_regex, preg_split, strtolower,
 };
 
 #[derive(Debug)]
@@ -305,7 +305,7 @@ impl RootPackageLoader {
         for (req_name, req_version) in requires {
             let mut constraints: Vec<String> = vec![];
 
-            let or_split = Preg::split(php_regex!(r"{\s*\|\|?\s*}"), req_version.trim());
+            let or_split = preg_split(php_regex!(r"{\s*\|\|?\s*}"), req_version.trim());
             for or_constraint in &or_split {
                 let and_split = shirabe_semver::split_and_constraints(or_constraint);
                 for and_constraint in and_split {
diff --git a/crates/shirabe/src/repository/array_repository.rs b/crates/shirabe/src/repository/array_repository.rs
index b28cccdc..0f3dc237 100644
--- a/crates/shirabe/src/repository/array_repository.rs
+++ b/crates/shirabe/src/repository/array_repository.rs
@@ -13,7 +13,7 @@ use crate::repository::{
 };
 use indexmap::IndexMap;
 use shirabe_pcre::Preg;
-use shirabe_php_shim::{implode, php_regex, preg_quote, strtolower};
+use shirabe_php_shim::{implode, php_regex, preg_quote, preg_split, strtolower};
 use shirabe_semver::constraint::AnyConstraint;
 use shirabe_semver::constraint::SimpleConstraint;
 use std::rc::Weak;
@@ -329,11 +329,11 @@ impl RepositoryInterface for ArrayRepository {
         r#type: Option<String>,
     ) -> anyhow::Result<Vec<SearchResult>> {
         let regex = if mode == crate::repository::SEARCH_FULLTEXT {
-            let parts = Preg::split(php_regex!("{\\s+}"), &preg_quote(&query, None));
+            let parts = preg_split(php_regex!("{\\s+}"), &preg_quote(&query, None));
             format!("{{(?:{})}}i", implode("|", &parts))
         } else {
             // vendor/name searches expect the caller to have preg_quoted the query
-            let parts = Preg::split(php_regex!("{\\s+}"), &query);
+            let parts = preg_split(php_regex!("{\\s+}"), &query);
             format!("{{(?:{})}}i", implode("|", &parts))
         };
 
diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs
index ab8572ad..5f9314b4 100644
--- a/crates/shirabe/src/repository/composer_repository.rs
+++ b/crates/shirabe/src/repository/composer_repository.rs
@@ -42,7 +42,8 @@ use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     AnyThrowable, CmpOp, InvalidArgumentException, LogicException, PHP_EOL, PhpMixed,
     RuntimeException, UnexpectedValueException, extension_loaded, hash, http_build_query_mixed,
-    json_decode_assoc, parse_url, php_regex, realpath, strtolower, strtr, urlencode, var_export,
+    json_decode_assoc, parse_url, php_regex, preg_split, realpath, strtolower, strtr, urlencode,
+    var_export,
 };
 use shirabe_semver::CompilingMatcher;
 use shirabe_semver::constraint::AnyConstraint;
@@ -764,7 +765,7 @@ impl ComposerRepository {
 
         if mode == SEARCH_VENDOR {
             let mut results: Vec<IndexMap<String, PhpMixed>> = Vec::new();
-            let parts = Preg::split(php_regex!(r"{\s+}"), &query);
+            let parts = preg_split(php_regex!(r"{\s+}"), &query);
             let regex = format!("{{(?:{})}}i", parts.join("|"));
 
             let vendor_names = self.get_vendor_names()?;
@@ -828,7 +829,7 @@ impl ComposerRepository {
             }
 
             let mut results: Vec<IndexMap<String, PhpMixed>> = Vec::new();
-            let parts = Preg::split(php_regex!(r"{\s+}"), &query);
+            let parts = preg_split(php_regex!(r"{\s+}"), &query);
             let regex = format!("{{(?:{})}}i", parts.join("|"));
 
             let package_names = self.get_package_names(None)?;
diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs
index 341d9f18..4c0df86a 100644
--- a/crates/shirabe/src/repository/vcs/github_driver.rs
+++ b/crates/shirabe/src/repository/vcs/github_driver.rs
@@ -19,7 +19,7 @@ use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     InvalidArgumentException, PhpMixed, RuntimeException, array_diff, array_map,
     array_search_mixed, base64_decode, basename, empty, explode, extension_loaded, in_array_loose,
-    parse_url, php_regex, strpos, strtolower, substr, trim, urlencode,
+    parse_url, php_regex, preg_split, strpos, strtolower, substr, trim, urlencode,
 };
 
 #[derive(Debug)]
@@ -493,7 +493,7 @@ impl GitHubDriver {
 
         let mut result: Vec<IndexMap<String, PhpMixed>> = vec![];
         let mut key: Option<String> = None;
-        for line in Preg::split(php_regex!(r"{\r?\n}"), &funding) {
+        for line in preg_split(php_regex!(r"{\r?\n}"), &funding) {
             let line = trim(&line, None);
             let mut m: IndexMap<CaptureKey, String> = IndexMap::new();
             if Preg::is_match3(php_regex!(r"{^(\w+)\s*:\s*(.+)$}"), &line, Some(&mut m)) {
@@ -508,7 +508,7 @@ impl GitHubDriver {
                     let inner = m2.get(&CaptureKey::ByIndex(1)).cloned().unwrap_or_default();
                     for item in array_map(
                         |s: &String| trim(s, None),
-                        &Preg::split(php_regex!(r#"{[\'\"]?\s*,\s*[\'\"]?}"#), &inner),
+                        &preg_split(php_regex!(r#"{[\'\"]?\s*,\s*[\'\"]?}"#), &inner),
                     ) {
                         let mut entry = IndexMap::new();
                         entry.insert("type".to_string(), PhpMixed::String(g1.clone()));
diff --git a/crates/shirabe/src/util/no_proxy_pattern.rs b/crates/shirabe/src/util/no_proxy_pattern.rs
index 85e1f472..cd54fa1a 100644
--- a/crates/shirabe/src/util/no_proxy_pattern.rs
+++ b/crates/shirabe/src/util/no_proxy_pattern.rs
@@ -1,10 +1,10 @@
 //! ref: composer/src/Composer/Util/NoProxyPattern.php
 
 use indexmap::IndexMap;
-use shirabe_pcre::Preg;
 use shirabe_php_shim::{
     RuntimeException, array_key_exists, explode, filter_var_int_with_range, filter_var_ip,
-    inet_pton, ltrim, parse_url, php_regex, stripos, strlen, strpbrk, strpos, substr, substr_count,
+    inet_pton, ltrim, parse_url, php_regex, preg_split, stripos, strlen, strpbrk, strpos, substr,
+    substr_count,
 };
 
 /// Tests URLs against NO_PROXY patterns
@@ -37,7 +37,7 @@ impl NoProxyPattern {
     /// @param string $pattern NO_PROXY pattern
     pub fn new(pattern: &str) -> Self {
         // PHP: Preg::split('{[\s,]+}', $pattern, -1, PREG_SPLIT_NO_EMPTY)
-        let host_names = Preg::split(php_regex!(r"{[\s,]+}"), pattern);
+        let host_names = preg_split(php_regex!(r"{[\s,]+}"), pattern);
         let noproxy = host_names.is_empty() || host_names[0] == "*";
         Self {
             host_names,
diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs
index 875c8810..fc67604e 100644
--- a/crates/shirabe/src/util/process_executor.rs
+++ b/crates/shirabe/src/util/process_executor.rs
@@ -12,7 +12,7 @@ use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
     LogicException, PHP_EOL, PhpMixed, RuntimeException, array_intersect, array_map,
     escapeshellarg, explode, implode, in_array_strict, is_array, is_dir, is_numeric, is_string,
-    php_regex, rtrim, str_replace, strcspn, strlen, strpbrk, strtolower, strtr_array,
+    php_regex, preg_split, rtrim, str_replace, strcspn, strlen, strpbrk, strtolower, strtr_array,
     substr_replace, trim,
 };
 use shirabe_symfony_process::ExecutableFinder;
@@ -779,7 +779,7 @@ impl ProcessExecutor {
         if output.is_empty() {
             vec![]
         } else {
-            Preg::split(php_regex!(r"{\r?\n}"), &output)
+            preg_split(php_regex!(r"{\r?\n}"), &output)
         }
     }
 
diff --git a/crates/shirabe/tests/all_functional_test.rs b/crates/shirabe/tests/all_functional_test.rs
index 9ca09dc4..7d71c649 100644
--- a/crates/shirabe/tests/all_functional_test.rs
+++ b/crates/shirabe/tests/all_functional_test.rs
@@ -9,7 +9,7 @@ use indexmap::IndexMap;
 use serial_test::serial;
 use shirabe::util::filesystem::Filesystem;
 use shirabe_pcre::preg::Preg;
-use shirabe_php_shim::{CaptureKey, PREG_SPLIT_DELIM_CAPTURE, PhpMixed, intval, php_regex};
+use shirabe_php_shim::{CaptureKey, PhpMixed, intval, php_regex, preg_split_delim_capture};
 use std::path::{Path, PathBuf};
 
 /// ref: AllFunctionalTest's `$oldcwd` / `$testDir` instance state plus its `setUp`/`tearDown`.
@@ -66,12 +66,7 @@ fn unique_tmp_directory() -> PathBuf {
 // ref: AllFunctionalTest::parseTestFile
 fn parse_test_file(file: &Path) -> IndexMap<String, String> {
     let contents = std::fs::read_to_string(file).unwrap();
-    let tokens = Preg::split4(
-        php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"),
-        &contents,
-        -1,
-        PREG_SPLIT_DELIM_CAPTURE,
-    );
+    let tokens = preg_split_delim_capture(php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents);
     let mut data: IndexMap<String, String> = IndexMap::new();
     let mut section: Option<String> = None;
 
diff --git a/crates/shirabe/tests/common/io_mock.rs b/crates/shirabe/tests/common/io_mock.rs
index 7ea3059c..c1bd5e00 100644
--- a/crates/shirabe/tests/common/io_mock.rs
+++ b/crates/shirabe/tests/common/io_mock.rs
@@ -6,7 +6,7 @@ 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};
+use shirabe_php_shim::{PHP_EOL, PhpMixed, php_regex, preg_quote, preg_split};
 use shirabe_symfony_console::output::output_interface;
 use std::collections::VecDeque;
 
@@ -126,7 +126,7 @@ impl IOMock {
         };
 
         if !expectations.is_empty() {
-            let mut lines: VecDeque<String> = Preg::split(php_regex!("{\r?\n}"), &output).into();
+            let mut lines: VecDeque<String> = preg_split(php_regex!("{\r?\n}"), &output).into();
             let mut auth_log: VecDeque<(String, String, Option<String>)> =
                 self.auth_log.clone().into();
 
diff --git a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
index 23f25957..a4d118ee 100644
--- a/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
+++ b/crates/shirabe/tests/dependency_resolver/pool_builder_test.rs
@@ -20,8 +20,7 @@ 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;
-use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture};
 use std::path::PathBuf;
 
 /// Maps the PHP `$loadPackage` closure: pops the optional `id` from the data, loads the
@@ -57,12 +56,7 @@ fn load_package(
 
 fn read_test_file(file: &str, fixtures_dir: &str) -> IndexMap<String, String> {
     let contents = shirabe_php_shim::file_get_contents(file).unwrap();
-    let tokens = Preg::split4(
-        php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"),
-        &contents,
-        -1,
-        PREG_SPLIT_DELIM_CAPTURE,
-    );
+    let tokens = preg_split_delim_capture(php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents);
 
     // PHP section_info is a map of name => required flag.
     let section_info: Vec<(&str, bool)> = vec![
diff --git a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
index 5e5ab1d6..8c08e1c0 100644
--- a/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
+++ b/crates/shirabe/tests/dependency_resolver/pool_optimizer_test.rs
@@ -12,8 +12,7 @@ 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;
-use shirabe_php_shim::{PREG_SPLIT_DELIM_CAPTURE, php_regex};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture};
 use std::path::PathBuf;
 
 fn load_package(package_data: &PhpMixed) -> BasePackageHandle {
@@ -61,12 +60,7 @@ fn reduce_packages_info_for_comparison(packages: &[BasePackageHandle]) -> Vec<St
 
 fn read_test_file(file: &str, fixtures_dir: &str) -> IndexMap<String, String> {
     let contents = shirabe_php_shim::file_get_contents(file).unwrap();
-    let tokens = Preg::split4(
-        php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"),
-        &contents,
-        -1,
-        PREG_SPLIT_DELIM_CAPTURE,
-    );
+    let tokens = preg_split_delim_capture(php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents);
 
     let section_info: Vec<&str> = vec!["TEST", "REQUEST", "POOL-BEFORE", "POOL-AFTER"];
 
diff --git a/crates/shirabe/tests/installer_test.rs b/crates/shirabe/tests/installer_test.rs
index a4c04c00..7b86be89 100644
--- a/crates/shirabe/tests/installer_test.rs
+++ b/crates/shirabe/tests/installer_test.rs
@@ -43,7 +43,7 @@ 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::{PREG_SPLIT_DELIM_CAPTURE, PhpMixed, php_regex};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_split_delim_capture};
 use shirabe_semver::VersionParser;
 use shirabe_semver::constraint::AnyConstraint;
 use shirabe_symfony_console::command::Command as SymfonyCommand;
@@ -580,12 +580,7 @@ fn read_test_file(
     fixtures_dir: &std::path::Path,
 ) -> IndexMap<String, String> {
     let contents = std::fs::read_to_string(file).unwrap();
-    let tokens = Preg::split4(
-        php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"),
-        &contents,
-        -1,
-        PREG_SPLIT_DELIM_CAPTURE,
-    );
+    let tokens = preg_split_delim_capture(php_regex!(r"#(?:^|\n*)--([A-Z-]+)--\n#"), &contents);
 
     let section_info: [(&str, bool); 13] = [
         ("TEST", true),