aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package/loader
diff options
context:
space:
mode:
Diffstat (limited to 'crates/shirabe/src/package/loader')
-rw-r--r--crates/shirabe/src/package/loader/array_loader.rs22
-rw-r--r--crates/shirabe/src/package/loader/json_loader.rs6
-rw-r--r--crates/shirabe/src/package/loader/loader_interface.rs2
-rw-r--r--crates/shirabe/src/package/loader/mod.rs7
-rw-r--r--crates/shirabe/src/package/loader/root_package_loader.rs34
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs20
6 files changed, 49 insertions, 42 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs
index 82b2ef7..ffbe465 100644
--- a/crates/shirabe/src/package/loader/array_loader.rs
+++ b/crates/shirabe/src/package/loader/array_loader.rs
@@ -3,23 +3,23 @@
use anyhow::Result;
use chrono::{DateTime, TimeZone, Utc};
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
+use shirabe_external_packages::composer::pcre::Preg;
use shirabe_php_shim::{
E_USER_DEPRECATED, Exception, LogicException, PhpMixed, UnexpectedValueException, is_scalar,
is_string, json_encode, ltrim, sprintf, stripos, strpos, strtolower, strval, substr,
trigger_error, trim, ucfirst,
};
-use crate::package::base_package::{BasePackage, SUPPORTED_LINK_TYPES};
-use crate::package::complete_alias_package::CompleteAliasPackage;
-use crate::package::complete_package::CompletePackage;
-use crate::package::complete_package_interface::CompletePackageInterface;
-use crate::package::link::Link;
-use crate::package::loader::loader_interface::LoaderInterface;
-use crate::package::package_interface::PackageInterface;
-use crate::package::root_alias_package::RootAliasPackage;
-use crate::package::root_package::RootPackage;
-use crate::package::version::version_parser::VersionParser;
+use crate::package::CompleteAliasPackage;
+use crate::package::CompletePackage;
+use crate::package::CompletePackageInterface;
+use crate::package::Link;
+use crate::package::PackageInterface;
+use crate::package::RootAliasPackage;
+use crate::package::RootPackage;
+use crate::package::loader::LoaderInterface;
+use crate::package::version::VersionParser;
+use crate::package::{BasePackage, SUPPORTED_LINK_TYPES};
#[derive(Debug)]
pub struct ArrayLoader {
diff --git a/crates/shirabe/src/package/loader/json_loader.rs b/crates/shirabe/src/package/loader/json_loader.rs
index cb3cbeb..e0589bb 100644
--- a/crates/shirabe/src/package/loader/json_loader.rs
+++ b/crates/shirabe/src/package/loader/json_loader.rs
@@ -1,8 +1,8 @@
//! ref: composer/src/Composer/Package/Loader/JsonLoader.php
-use crate::json::json_file::JsonFile;
-use crate::package::base_package::BasePackage;
-use crate::package::loader::loader_interface::LoaderInterface;
+use crate::json::JsonFile;
+use crate::package::BasePackage;
+use crate::package::loader::LoaderInterface;
use anyhow::Result;
use std::path::Path;
diff --git a/crates/shirabe/src/package/loader/loader_interface.rs b/crates/shirabe/src/package/loader/loader_interface.rs
index 2b93bc5..d10b7be 100644
--- a/crates/shirabe/src/package/loader/loader_interface.rs
+++ b/crates/shirabe/src/package/loader/loader_interface.rs
@@ -1,6 +1,6 @@
//! ref: composer/src/Composer/Package/Loader/LoaderInterface.php
-use crate::package::base_package::BasePackage;
+use crate::package::BasePackage;
use indexmap::IndexMap;
use shirabe_php_shim::PhpMixed;
diff --git a/crates/shirabe/src/package/loader/mod.rs b/crates/shirabe/src/package/loader/mod.rs
index 402b59c..1073172 100644
--- a/crates/shirabe/src/package/loader/mod.rs
+++ b/crates/shirabe/src/package/loader/mod.rs
@@ -4,3 +4,10 @@ pub mod json_loader;
pub mod loader_interface;
pub mod root_package_loader;
pub mod validating_array_loader;
+
+pub use array_loader::*;
+pub use invalid_package_exception::*;
+pub use json_loader::*;
+pub use loader_interface::*;
+pub use root_package_loader::*;
+pub use validating_array_loader::*;
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs
index 15f1114..231c807 100644
--- a/crates/shirabe/src/package/loader/root_package_loader.rs
+++ b/crates/shirabe/src/package/loader/root_package_loader.rs
@@ -1,28 +1,28 @@
//! ref: composer/src/Composer/Package/Loader/RootPackageLoader.php
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg};
+use shirabe_external_packages::composer::pcre::{CaptureKey, Preg};
use shirabe_php_shim::{
LogicException, RuntimeException, UnexpectedValueException, strtolower, ucfirst,
};
use crate::config::Config;
-use crate::io::io_interface::IOInterface;
-use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES};
-use crate::package::complete_package_interface::CompletePackageInterface;
-use crate::package::loader::array_loader::ArrayLoader;
-use crate::package::loader::loader_interface::LoaderInterface;
-use crate::package::loader::validating_array_loader::ValidatingArrayLoader;
-use crate::package::package_interface::PackageInterface;
-use crate::package::root_alias_package::RootAliasPackage;
-use crate::package::root_package::RootPackage;
-use crate::package::root_package_interface::RootPackageInterface;
-use crate::package::version::version_guesser::VersionGuesser;
-use crate::package::version::version_parser::VersionParser;
-use crate::repository::repository_factory::RepositoryFactory;
-use crate::repository::repository_manager::RepositoryManager;
-use crate::util::platform::Platform;
-use crate::util::process_executor::ProcessExecutor;
+use crate::io::IOInterface;
+use crate::package::CompletePackageInterface;
+use crate::package::PackageInterface;
+use crate::package::RootAliasPackage;
+use crate::package::RootPackage;
+use crate::package::RootPackageInterface;
+use crate::package::loader::ArrayLoader;
+use crate::package::loader::LoaderInterface;
+use crate::package::loader::ValidatingArrayLoader;
+use crate::package::version::VersionGuesser;
+use crate::package::version::VersionParser;
+use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES};
+use crate::repository::RepositoryFactory;
+use crate::repository::RepositoryManager;
+use crate::util::Platform;
+use crate::util::ProcessExecutor;
#[derive(Debug)]
pub struct RootPackageLoader {
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index f01b774..59fc266 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -3,24 +3,24 @@
use chrono::TimeZone;
use indexmap::IndexMap;
-use shirabe_external_packages::composer::pcre::preg::Preg;
-use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses;
+use shirabe_external_packages::composer::pcre::Preg;
+use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses;
use shirabe_php_shim::{
E_USER_DEPRECATED, Exception, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key,
array_values, filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar,
is_string, json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp,
strtolower, strtotime, substr, trigger_error, trim, var_export,
};
-use shirabe_semver::constraint::constraint::Constraint;
-use shirabe_semver::constraint::constraint_interface::ConstraintInterface;
-use shirabe_semver::constraint::match_none_constraint::MatchNoneConstraint;
+use shirabe_semver::constraint::Constraint;
+use shirabe_semver::constraint::ConstraintInterface;
+use shirabe_semver::constraint::MatchNoneConstraint;
use shirabe_semver::intervals::Intervals;
-use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES};
-use crate::package::loader::invalid_package_exception::InvalidPackageException;
-use crate::package::loader::loader_interface::LoaderInterface;
-use crate::package::version::version_parser::VersionParser;
-use crate::repository::platform_repository::PlatformRepository;
+use crate::package::loader::InvalidPackageException;
+use crate::package::loader::LoaderInterface;
+use crate::package::version::VersionParser;
+use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES};
+use crate::repository::PlatformRepository;
#[derive(Debug)]
pub struct ValidatingArrayLoader {