1 files changed, 23 insertions, 13 deletions

diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs
index c224e8e6..62cca379 100644
--- a/crates/shirabe/src/repository/vcs/git_driver.rs
+++ b/crates/shirabe/src/repository/vcs/git_driver.rs
@@ -14,11 +14,10 @@ use crate::util::Url;
 use chrono::TimeZone;
 use chrono::{DateTime, FixedOffset, Utc};
 use indexmap::IndexMap;
-use shirabe_pcre::Preg;
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
-    InvalidArgumentException, RuntimeException, dirname, is_dir, is_writable, realpath,
-    sys_get_temp_dir,
+    InvalidArgumentException, RuntimeException, dirname, is_dir, is_writable, preg_match2,
+    preg_replace, realpath, sys_get_temp_dir,
 };
 use shirabe_php_shim::{PhpMixed, php_regex};
 
@@ -51,7 +50,7 @@ impl GitDriver {
     pub fn initialize(&mut self) -> anyhow::Result<()> {
         let cache_url;
         if Filesystem::is_local_path(&self.inner.url) {
-            self.inner.url = Preg::replace(php_regex!(r"{[\\/]\.git/?$}"), "", &self.inner.url);
+            self.inner.url = preg_replace(php_regex!(r"{[\\/]\.git/?$}"), "", &self.inner.url);
             if !is_dir(&self.inner.url) {
                 return Err(RuntimeException::new(format!(
                     "Failed to read package information from {} as the path does not exist",
@@ -78,7 +77,7 @@ impl GitDriver {
             self.repo_dir = format!(
                 "{}/{}/",
                 cache_vcs_dir,
-                Preg::replace(
+                preg_replace(
                     r"{[^a-z0-9.]}i",
                     "-",
                     &Url::sanitize(self.inner.url.clone())
@@ -99,7 +98,13 @@ impl GitDriver {
                 .into());
             }
 
-            if Preg::is_match(php_regex!(r"{^ssh://[^@]+@[^:]+:[^0-9]+}"), &self.inner.url) {
+            if preg_match2(
+                php_regex!(r"{^ssh://[^@]+@[^:]+:[^0-9]+}"),
+                &self.inner.url,
+                0,
+            )
+            .is_some()
+            {
                 return Err(InvalidArgumentException::new(format!(
                     "The source URL {} is invalid, ssh URLs should have a port number after \":\".\nUse ssh://git@example.com:22/path or just git@example.com:path if you do not want to provide a password or custom port.",
                     self.inner.url
@@ -146,7 +151,7 @@ impl GitDriver {
             &format!(
                 "{}/{}",
                 cache_repo_dir,
-                Preg::replace(r"{[^a-z0-9.]}i", "-", &Url::sanitize(cache_url))
+                preg_replace(r"{[^a-z0-9.]}i", "-", &Url::sanitize(cache_url))
             ),
             None,
             None,
@@ -199,7 +204,7 @@ impl GitDriver {
             if !branches.contains(&"* master".to_string()) {
                 for branch in &branches {
                     if !branch.is_empty()
-                        && let Some(caps) = Preg::match3(php_regex!(r"{^\* +(\S+)}"), branch)
+                        && let Some(caps) = preg_match2(php_regex!(r"{^\* +(\S+)}"), branch, 0)
                         && let Some(name) = caps.get(1)
                     {
                         self.root_identifier = Some(name.to_string());
@@ -309,9 +314,10 @@ impl GitDriver {
             );
             for tag in self.inner.process.borrow().split_lines(&output) {
                 if !tag.is_empty()
-                    && let Some(caps) = Preg::match3(
+                    && let Some(caps) = preg_match2(
                         php_regex!(r"{^([a-f0-9]{40}) refs/tags/(\S+?)(\^\{\})?$}"),
                         &tag,
+                        0,
                     )
                     && let (Some(hash), Some(name)) = (caps.get(1), caps.get(2))
                 {
@@ -344,10 +350,11 @@ impl GitDriver {
             );
             for branch in self.inner.process.borrow().split_lines(&output) {
                 if !branch.is_empty()
-                    && !Preg::is_match(php_regex!(r"{^ *[^/]+/HEAD }"), &branch)
-                    && let Some(caps) = Preg::match3(
+                    && preg_match2(php_regex!(r"{^ *[^/]+/HEAD }"), &branch, 0).is_none()
+                    && let Some(caps) = preg_match2(
                         php_regex!(r"{^(?:\* )? *(\S+) *([a-f0-9]+)(?: .*)?$}"),
                         &branch,
+                        0,
                     )
                     && let (Some(name), Some(hash)) = (caps.get(1), caps.get(2))
                     && !name.starts_with('-')
@@ -368,10 +375,13 @@ impl GitDriver {
         url: &str,
         deep: bool,
     ) -> anyhow::Result<bool> {
-        if Preg::is_match(
+        if preg_match2(
             php_regex!(r"#(^git://|\.git/?$|git(?:olite)?@|//git\.|//github.com/)#i"),
             url,
-        ) {
+            0,
+        )
+        .is_some()
+        {
             return Ok(true);
         }