1 files changed, 8 insertions, 7 deletions
diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs
index 6140bb08..91165015 100644
--- a/crates/shirabe/src/util/http/curl_downloader.rs
+++ b/crates/shirabe/src/util/http/curl_downloader.rs
@@ -31,10 +31,9 @@ use crate::util::http::ProxyManager;
 use crate::util::http::Response;
 use crate::util::{AuthHelper, PromptAuthResult, StoreAuth};
 use indexmap::IndexMap;
-use shirabe_pcre::Preg;
 use shirabe_php_shim::{
-    PhpMixed, in_array_loose, in_array_strict, parse_url, php_regex, preg_quote, rename, strpos,
-    substr, unlink_silent,
+    PhpMixed, in_array_loose, in_array_strict, parse_url, php_regex, preg_match2, preg_quote,
+    preg_replace, rename, strpos, substr, unlink_silent,
 };
 use std::sync::atomic::{AtomicBool, Ordering};
 
@@ -147,7 +146,7 @@ impl CurlDownloader {
 
         // check URL can be accessed (i.e. is not insecure), but allow insecure Packagist calls to
         // $hashed providers as file integrity is verified with sha256
-        if !Preg::is_match(php_regex!(r"{^http://(repo\.)?packagist\.org/p/}"), url)
+        if preg_match2(php_regex!(r"{^http://(repo\.)?packagist\.org/p/}"), url, 0).is_none()
             || (strpos(url, "$").is_none() && strpos(url, "%24").is_none())
         {
             self.config.borrow_mut().prohibit_url_by_config(
@@ -653,7 +652,7 @@ impl CurlDownloader {
                 // Absolute path; e.g. /foo
                 let url_host = parse_url(url).and_then(|parsed| parsed.host);
                 let url_host_str = url_host.as_deref().unwrap_or("");
-                target_url = Preg::replace(
+                target_url = preg_replace(
                     format!(
                         r"{{^(.+(?://|@){}(?::\d+)?)(?:[/\?].*)?$}}",
                         preg_quote(url_host_str, None)
@@ -663,7 +662,7 @@ impl CurlDownloader {
                 );
             } else {
                 // Relative path; e.g. foo
-                target_url = Preg::replace(
+                target_url = preg_replace(
                     php_regex!(r"{^(.+/)[^/?]*(?:\?.*)?$}"),
                     &format!("\\1{}", location_header),
                     url,
@@ -747,13 +746,15 @@ impl CurlDownloader {
             && substr(url, -4, None) == ".zip"
             && (location_header.is_none()
                 || substr(location_header.as_deref().unwrap_or(""), -4, None) != ".zip")
-            && Preg::is_match(
+            && preg_match2(
                 php_regex!(r"{^text/html\b}i"),
                 &response
                     .inner
                     .get_header("content-type")
                     .unwrap_or_default(),
+                0,
             )
+            .is_some()
         {
             needs_auth_retry = Some("Bitbucket requires authentication and it was not provided");
         }