diff options
Diffstat (limited to 'crates')
4 files changed, 2 insertions, 47 deletions
diff --git a/crates/shirabe-external-packages/src/composer/mod.rs b/crates/shirabe-external-packages/src/composer/mod.rs index c70fa2a..907f985 100644 --- a/crates/shirabe-external-packages/src/composer/mod.rs +++ b/crates/shirabe-external-packages/src/composer/mod.rs @@ -1,9 +1,7 @@ pub mod ca_bundle; pub mod pcre; -pub mod util; pub mod xdebug_handler; pub use ca_bundle::*; pub use pcre::*; -pub use util::*; pub use xdebug_handler::*; diff --git a/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs b/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs deleted file mode 100644 index e9e5193..0000000 --- a/crates/shirabe-external-packages/src/composer/util/composer_mirror.rs +++ /dev/null @@ -1,35 +0,0 @@ -//! ref: composer/src/Composer/Util/ComposerMirror.php - -#[derive(Debug)] -pub struct ComposerMirror; - -impl ComposerMirror { - pub fn process_url( - _mirror_url: &str, - _package_name: &str, - _version: &str, - _reference: Option<&str>, - _r_type: Option<&str>, - _pretty_version: Option<&str>, - ) -> String { - todo!() - } - - pub fn process_git_url( - _mirror: &str, - _package_name: &str, - _url: &str, - _extension: &str, - ) -> String { - todo!() - } - - pub fn process_hg_url( - _mirror: &str, - _package_name: &str, - _url: &str, - _extension: &str, - ) -> String { - todo!() - } -} diff --git a/crates/shirabe-external-packages/src/composer/util/mod.rs b/crates/shirabe-external-packages/src/composer/util/mod.rs deleted file mode 100644 index 02c41b6..0000000 --- a/crates/shirabe-external-packages/src/composer/util/mod.rs +++ /dev/null @@ -1,3 +0,0 @@ -pub mod composer_mirror; - -pub use composer_mirror::*; 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, |