3 files changed, 10 insertions, 11 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs
index 4bcb6865..4e3b5e4c 100644
--- a/crates/shirabe/src/installer/binary_installer.rs
+++ b/crates/shirabe/src/installer/binary_installer.rs
@@ -8,11 +8,10 @@ use crate::util::Filesystem;
 use crate::util::Platform;
 use crate::util::ProcessExecutor;
 use crate::util::Silencer;
-use shirabe_pcre::Preg;
 use shirabe_php_shim::{
     PhpMixed, basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists,
-    file_get_contents5, file_put_contents, fopen, is_dir, is_file, is_link, php_regex, realpath,
-    rmdir, substr, trim, umask,
+    file_get_contents5, file_put_contents, fopen, is_dir, is_file, is_link, php_regex, preg_match2,
+    realpath, rmdir, substr, trim, umask,
 };
 
 /// Seam over the BinaryInstaller methods reached through LibraryInstaller, so tests can inject a
@@ -201,9 +200,10 @@ impl BinaryInstaller {
             }
             Err(_) => String::new(),
         };
-        if let Some(m) = Preg::is_match3(
+        if let Some(m) = preg_match2(
             php_regex!(r"{^#!/(?:usr/bin/env )?(?:[^/]+/)*(.+)$}m"),
             &line,
+            0,
         ) {
             return trim(m.get(1).unwrap_or(""), None);
         }
@@ -316,9 +316,10 @@ impl BinaryInstaller {
             file_get_contents5(bin, false, PhpMixed::Null, 0, Some(500)).unwrap_or_default();
         // For php files, we generate a PHP proxy instead of a shell one,
         // which allows calling the proxy with a custom php process
-        if let Some(m) = Preg::is_match3(
+        if let Some(m) = preg_match2(
             php_regex!(r"{^(#!.*\r?\n)?[\r\n\t ]*<\?php}"),
             &bin_contents,
+            0,
         ) {
             // carry over the existing shebang if present, otherwise add our own
             let proxy_code = match m.get(1) {
diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs
index 5f3b2054..d3bf4643 100644
--- a/crates/shirabe/src/installer/library_installer.rs
+++ b/crates/shirabe/src/installer/library_installer.rs
@@ -12,10 +12,9 @@ use crate::repository::InstalledRepositoryInterfaceHandle;
 use crate::util::Filesystem;
 use crate::util::Platform;
 use crate::util::Silencer;
-use shirabe_pcre::Preg;
 use shirabe_php_shim::{
     InvalidArgumentException, LogicException, PhpMixed, dirname, is_dir, is_link, preg_quote,
-    realpath, rmdir, rtrim, strpos,
+    preg_replace, realpath, rmdir, rtrim, strpos,
 };
 
 /// Package installation manager.
@@ -127,7 +126,7 @@ impl LibraryInstaller {
         if let Some(target_dir) = target_dir
             && !target_dir.is_empty()
         {
-            let replaced = Preg::replace(
+            let replaced = preg_replace(
                 format!(
                     "{{/*{}/?$}}",
                     preg_quote(&target_dir, None).replace('/', "/+")
diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs
index 916f647d..a450c869 100644
--- a/crates/shirabe/src/installer/suggested_packages_reporter.rs
+++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs
@@ -6,8 +6,7 @@ use crate::package::PackageInterfaceHandle;
 use crate::repository::InstalledRepository;
 use crate::repository::RepositoryInterface;
 use indexmap::IndexMap;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::php_regex;
+use shirabe_php_shim::{php_regex, preg_replace};
 use shirabe_symfony_console::formatter::OutputFormatter;
 
 #[derive(Debug)]
@@ -207,6 +206,6 @@ impl SuggestedPackagesReporter {
     }
 
     fn remove_control_characters(&self, string: &str) -> String {
-        Preg::replace(php_regex!("/[[:cntrl:]]/"), "", &string.replace('\n', " "))
+        preg_replace(php_regex!("/[[:cntrl:]]/"), "", &string.replace('\n', " "))
     }
 }