2 files changed, 20 insertions, 18 deletions
diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs
index 64b348e1..027205a0 100644
--- a/crates/shirabe/src/downloader/file_downloader.rs
+++ b/crates/shirabe/src/downloader/file_downloader.rs
@@ -27,10 +27,10 @@ use crate::util::sync_executor;
 use indexmap::IndexMap;
 use shirabe_php_shim::Catch as _;
 use shirabe_php_shim::{
-    InvalidArgumentException, PATHINFO_BASENAME, PATHINFO_EXTENSION, PHP_URL_PATH, PhpMixed,
-    RuntimeException, UnexpectedValueException, array_search, file_exists, filesize, get_class,
-    hash, hash_file, impl_php_class, is_dir, is_executable, parse_url, pathinfo, realpath, rtrim,
-    spl_object_hash, strlen, strpos, strtr, trim, umask, usleep,
+    InvalidArgumentException, PATHINFO_BASENAME, PATHINFO_EXTENSION, PhpMixed, RuntimeException,
+    UnexpectedValueException, array_search, file_exists, filesize, get_class, hash, hash_file,
+    impl_php_class, is_dir, is_executable, parse_url, pathinfo, realpath, rtrim, spl_object_hash,
+    strlen, strpos, strtr, trim, umask, usleep,
 };
 use std::sync::{LazyLock, Mutex};
 
@@ -259,12 +259,13 @@ impl FileDownloader {
 
     fn get_dist_path(&self, package: PackageInterfaceHandle, component: i64) -> String {
         pathinfo(
-            parse_url(
-                &strtr(&package.get_dist_url().unwrap_or_default(), "\\", "/"),
-                PHP_URL_PATH,
-            )
-            .as_string()
-            .unwrap_or(""),
+            &parse_url(&strtr(
+                &package.get_dist_url().unwrap_or_default(),
+                "\\",
+                "/",
+            ))
+            .and_then(|url| url.path)
+            .unwrap_or_default(),
             component,
         )
     }
diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs
index 962c5bb8..ff229d38 100644
--- a/crates/shirabe/src/downloader/gzip_downloader.rs
+++ b/crates/shirabe/src/downloader/gzip_downloader.rs
@@ -14,8 +14,8 @@ use crate::util::Platform;
 use crate::util::ProcessExecutor;
 use indexmap::IndexMap;
 use shirabe_php_shim::{
-    PATHINFO_FILENAME, PHP_URL_PATH, PhpMixed, RuntimeException, extension_loaded, fclose, fopen,
-    fwrite, gzclose, gzopen, gzread, impl_php_class, implode, parse_url, pathinfo, strtr,
+    PATHINFO_FILENAME, PhpMixed, RuntimeException, extension_loaded, fclose, fopen, fwrite,
+    gzclose, gzopen, gzread, impl_php_class, implode, parse_url, pathinfo, strtr,
 };
 
 #[derive(Debug)]
@@ -82,12 +82,13 @@ impl ArchiveDownloader for GzipDownloader {
         path: &str,
     ) -> anyhow::Result<Option<PhpMixed>> {
         let filename = pathinfo(
-            parse_url(
-                &strtr(&package.get_dist_url().unwrap_or_default(), "\\", "/"),
-                PHP_URL_PATH,
-            )
-            .as_string()
-            .unwrap_or(""),
+            &parse_url(&strtr(
+                &package.get_dist_url().unwrap_or_default(),
+                "\\",
+                "/",
+            ))
+            .and_then(|url| url.path)
+            .unwrap_or_default(),
             PATHINFO_FILENAME,
         );
         let target_filepath = std::path::Path::new(path)