From b2b321a26f6a628ee8e6757eb8577613e2024e70 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 24 Jun 2026 01:45:14 +0900 Subject: refactor(package): point ComposerMirror to crate::util, drop external stub ComposerMirror is part of Composer itself (Util/ComposerMirror.php), not an external package, so its stub belongs in the shirabe crate's util module rather than shirabe-external-packages. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/package/package.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/package/package.rs') diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index a579baa..e2f1f1a 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -6,7 +6,6 @@ use chrono::{DateTime, Utc}; use indexmap::{IndexMap, IndexSet}; use shirabe_external_packages::composer::pcre::Preg; -use shirabe_external_packages::composer::util::ComposerMirror; use shirabe_php_shim::{E_USER_DEPRECATED, LogicException, PhpMixed, strpos, trigger_error}; use crate::package::BasePackage; @@ -16,6 +15,7 @@ use crate::package::PackageInterface; use crate::package::version::VersionParser; use crate::repository::RepositoryInterfaceHandle; use crate::repository::RepositoryInterfaceWeakHandle; +use crate::util::ComposerMirror; /// Mirror entry, e.g. `['url' => 'https://...', 'preferred' => true]`. #[derive(Debug, Clone)] @@ -484,12 +484,7 @@ impl Package { Some(self.pretty_version.as_str()), ) } else if url_type == "source" && r#type == Some("git") { - ComposerMirror::process_git_url( - &mirror.url, - &self.name, - &url, - r#type.unwrap_or(""), - ) + ComposerMirror::process_git_url(&mirror.url, &self.name, &url, r#type) } else if url_type == "source" && r#type == Some("hg") { ComposerMirror::process_hg_url( &mirror.url, -- cgit v1.3.1