From 2914770fba6b3cc03a68fae493f60470a41962ec Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 20 May 2026 09:54:30 +0900 Subject: refactor: re-export module items to shorten import paths --- crates/shirabe/src/command/about_command.rs | 12 ++-- crates/shirabe/src/command/archive_command.rs | 58 ++++++++-------- crates/shirabe/src/command/audit_command.rs | 26 ++++---- crates/shirabe/src/command/base_command.rs | 40 +++++------ crates/shirabe/src/command/base_config_command.rs | 14 ++-- .../shirabe/src/command/base_dependency_command.rs | 44 ++++++------ crates/shirabe/src/command/bump_command.rs | 67 +++++++++---------- .../src/command/check_platform_reqs_command.rs | 36 +++++----- crates/shirabe/src/command/clear_cache_command.rs | 6 +- crates/shirabe/src/command/config_command.rs | 30 ++++----- .../shirabe/src/command/create_project_command.rs | 74 ++++++++++---------- crates/shirabe/src/command/depends_command.rs | 20 +++--- crates/shirabe/src/command/diagnose_command.rs | 78 +++++++++++----------- .../shirabe/src/command/dump_autoload_command.rs | 14 ++-- crates/shirabe/src/command/exec_command.rs | 12 ++-- crates/shirabe/src/command/fund_command.rs | 34 +++++----- crates/shirabe/src/command/global_command.rs | 18 ++--- crates/shirabe/src/command/home_command.rs | 28 ++++---- crates/shirabe/src/command/init_command.rs | 46 ++++++------- crates/shirabe/src/command/install_command.rs | 20 +++--- crates/shirabe/src/command/licenses_command.rs | 44 ++++++------ crates/shirabe/src/command/mod.rs | 39 +++++++++++ crates/shirabe/src/command/outdated_command.rs | 14 ++-- .../shirabe/src/command/package_discovery_trait.rs | 72 +++++++++----------- crates/shirabe/src/command/prohibits_command.rs | 14 ++-- crates/shirabe/src/command/reinstall_command.rs | 38 +++++------ crates/shirabe/src/command/remove_command.rs | 34 +++++----- crates/shirabe/src/command/repository_command.rs | 22 +++--- crates/shirabe/src/command/require_command.rs | 75 ++++++++++----------- crates/shirabe/src/command/run_script_command.rs | 20 +++--- crates/shirabe/src/command/script_alias_command.rs | 16 ++--- crates/shirabe/src/command/search_command.rs | 24 +++---- crates/shirabe/src/command/self_update_command.rs | 26 ++++---- crates/shirabe/src/command/show_command.rs | 68 +++++++++---------- crates/shirabe/src/command/status_command.rs | 26 ++++---- crates/shirabe/src/command/suggests_command.rs | 26 ++++---- crates/shirabe/src/command/update_command.rs | 50 +++++++------- crates/shirabe/src/command/validate_command.rs | 22 +++--- 38 files changed, 664 insertions(+), 643 deletions(-) (limited to 'crates/shirabe/src/command') diff --git a/crates/shirabe/src/command/about_command.rs b/crates/shirabe/src/command/about_command.rs index 59b14fe..bd7643d 100644 --- a/crates/shirabe/src/command/about_command.rs +++ b/crates/shirabe/src/command/about_command.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Command/AboutCommand.php -use crate::command::base_command::BaseCommand; -use crate::command::base_command::BaseCommandData; -use crate::command::base_command::HasBaseCommandData; +use crate::command::BaseCommand; +use crate::command::BaseCommandData; +use crate::command::HasBaseCommandData; use crate::composer::Composer; -use crate::io::io_interface::IOInterface; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use crate::io::IOInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct AboutCommand { diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs index 4f97c4c..9c43fc6 100644 --- a/crates/shirabe/src/command/archive_command.rs +++ b/crates/shirabe/src/command/archive_command.rs @@ -4,33 +4,33 @@ use std::any::Any; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{LogicException, get_debug_type}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::package::archiver::archive_manager::ArchiveManager; -use crate::package::base_package::BasePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_set::RepositorySet; -use crate::script::script_events::ScriptEvents; -use crate::util::filesystem::Filesystem; +use crate::io::IOInterface; +use crate::package::BasePackage; +use crate::package::CompletePackageInterface; +use crate::package::archiver::ArchiveManager; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CompositeRepository; +use crate::repository::RepositoryFactory; +use crate::repository::RepositorySet; +use crate::script::ScriptEvents; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::ProcessExecutor; use crate::util::r#loop::Loop; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; #[derive(Debug)] pub struct ArchiveCommand { @@ -245,9 +245,8 @@ impl ArchiveCommand { if let Some(composer) = self.try_composer(None, None) { let local_repo = composer.get_repository_manager().get_local_repository(); - let mut repos: Vec< - Box, - > = vec![local_repo.clone_box()]; + let mut repos: Vec> = + vec![local_repo.clone_box()]; repos.extend( composer .get_repository_manager() @@ -301,12 +300,11 @@ impl ArchiveCommand { ); repo_set.add_repository(Box::new(repo))?; let parser = VersionParser::new(); - let constraint: Option< - Box, - > = match version.as_deref() { - Some(v) => Some(parser.parse_constraints(v)?.clone_box()), - None => None, - }; + let constraint: Option> = + match version.as_deref() { + Some(v) => Some(parser.parse_constraints(v)?.clone_box()), + None => None, + }; let packages = repo_set.find_packages(&package_name.to_lowercase(), constraint, 0); let package = if packages.len() > 1 { diff --git a/crates/shirabe/src/command/audit_command.rs b/crates/shirabe/src/command/audit_command.rs index 052bf0b..c2e6c93 100644 --- a/crates/shirabe/src/command/audit_command.rs +++ b/crates/shirabe/src/command/audit_command.rs @@ -1,20 +1,20 @@ //! ref: composer/src/Composer/Command/AuditCommand.php -use crate::advisory::audit_config::AuditConfig; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::advisory::AuditConfig; +use crate::advisory::Auditor; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; -use crate::repository::repository_utils::RepositoryUtils; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::InstalledRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; +use crate::repository::RepositoryUtils; use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, UnexpectedValueException, array_fill_keys, array_merge, implode, in_array, diff --git a/crates/shirabe/src/command/base_command.rs b/crates/shirabe/src/command/base_command.rs index e3a2569..2aebccb 100644 --- a/crates/shirabe/src/command/base_command.rs +++ b/crates/shirabe/src/command/base_command.rs @@ -3,35 +3,35 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::helper::table::Table; -use shirabe_external_packages::symfony::component::console::helper::table_separator::TableSeparator; -use shirabe_external_packages::symfony::component::console::input::input_definition::InputDefinition; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::component::console::terminal::Terminal; +use shirabe_external_packages::symfony::component::console::Terminal; +use shirabe_external_packages::symfony::component::console::helper::Table; +use shirabe_external_packages::symfony::component::console::helper::TableSeparator; +use shirabe_external_packages::symfony::component::console::input::InputDefinition; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, RuntimeException, UnexpectedValueException, count, explode, in_array, is_string, max, }; -use crate::advisory::audit_config::AuditConfig; -use crate::advisory::auditor::Auditor; -use crate::command::self_update_command::SelfUpdateCommand; +use crate::advisory::AuditConfig; +use crate::advisory::Auditor; +use crate::command::SelfUpdateCommand; use crate::composer::Composer; use crate::config::Config; -use crate::console::application::Application; +use crate::console::Application; +use crate::console::input::InputArgument; use crate::console::input::InputDefinitionItem; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::version::version_parser::VersionParser; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::pre_command_run_event::PreCommandRunEvent; -use crate::util::platform::Platform; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::version::VersionParser; +use crate::plugin::PluginEvents; +use crate::plugin::PreCommandRunEvent; +use crate::util::Platform; pub const SUCCESS: i64 = 0; pub const FAILURE: i64 = 1; diff --git a/crates/shirabe/src/command/base_config_command.rs b/crates/shirabe/src/command/base_config_command.rs index 9a599f6..081120d 100644 --- a/crates/shirabe/src/command/base_config_command.rs +++ b/crates/shirabe/src/command/base_config_command.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Command/BaseConfigCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::config::Config; -use crate::config::json_config_source::JsonConfigSource; +use crate::config::JsonConfigSource; use crate::factory::Factory; -use crate::json::json_file::JsonFile; -use crate::util::platform::Platform; -use crate::util::silencer::Silencer; +use crate::json::JsonFile; +use crate::util::Platform; +use crate::util::Silencer; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, chmod, touch}; pub trait BaseConfigCommand: BaseCommand { diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs index 316b1cc..7ef3b15 100644 --- a/crates/shirabe/src/command/base_dependency_command.rs +++ b/crates/shirabe/src/command/base_dependency_command.rs @@ -1,28 +1,28 @@ //! ref: composer/src/Composer/Command/BaseDependencyCommand.php use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::formatter::output_formatter_style::OutputFormatterStyle; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::symfony::component::console::formatter::OutputFormatterStyle; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, UnexpectedValueException}; -use shirabe_semver::constraint::bound::Bound; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; - -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package::Package; -use crate::package::root_package::RootPackage; -use crate::package::version::version_parser::VersionParser; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::installed_array_repository::InstalledArrayRepository; -use crate::repository::installed_repository::{DependentsEntry, InstalledRepository, NeedleInput}; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_interface::{FindPackageConstraint, RepositoryInterface}; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::package_info::PackageInfo; +use shirabe_semver::constraint::Bound; +use shirabe_semver::constraint::ConstraintInterface; + +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::Package; +use crate::package::RootPackage; +use crate::package::version::VersionParser; +use crate::repository::CompositeRepository; +use crate::repository::InstalledArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryFactory; +use crate::repository::RootPackageRepository; +use crate::repository::{DependentsEntry, InstalledRepository, NeedleInput}; +use crate::repository::{FindPackageConstraint, RepositoryInterface}; +use crate::util::PackageInfo; pub const ARGUMENT_PACKAGE: &str = "package"; pub const ARGUMENT_CONSTRAINT: &str = "version"; @@ -86,7 +86,7 @@ pub trait BaseDependencyCommand: BaseCommand { { output.writeln( "No dependencies installed. Try running composer install or update, or use --locked.", - shirabe_external_packages::symfony::console::output::output_interface::OUTPUT_NORMAL, + shirabe_external_packages::symfony::console::output::OUTPUT_NORMAL, ); return Ok(1); diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs index 9bfee8b..4141235 100644 --- a/crates/shirabe/src/command/bump_command.rs +++ b/crates/shirabe/src/command/bump_command.rs @@ -3,25 +3,25 @@ use crate::io::io_interface; use crate::package::base_package; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, file_get_contents, file_put_contents, is_writable, strtolower}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_manipulator::JsonManipulator; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::version::version_bumper::VersionBumper; -use crate::repository::platform_repository::PlatformRepository; -use crate::util::filesystem::Filesystem; -use crate::util::silencer::Silencer; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::json::JsonManipulator; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::version::VersionBumper; +use crate::repository::PlatformRepository; +use crate::util::Filesystem; +use crate::util::Silencer; #[derive(Debug)] pub struct BumpCommand { @@ -142,27 +142,26 @@ impl BumpCommand { .get("lock") .as_bool() .unwrap_or(true); - let repo: Box = - if !has_lock_file_disabled { - Box::new(composer.get_locker_mut().get_locked_repository(true)?) - } else if composer.get_locker_mut().is_locked() { - if !composer.get_locker_mut().is_fresh()? { - io.write_error3( + let repo: Box = if !has_lock_file_disabled { + Box::new(composer.get_locker_mut().get_locked_repository(true)?) + } else if composer.get_locker_mut().is_locked() { + if !composer.get_locker_mut().is_fresh()? { + io.write_error3( "The lock file is not up to date with the latest changes in composer.json. Run the appropriate `update` to fix that before you use the `bump` command.", true, io_interface::NORMAL, ); - return Ok(Self::ERROR_LOCK_OUTDATED); - } - Box::new(composer.get_locker_mut().get_locked_repository(true)?) - } else { - // TODO(phase-b): get_local_repository returns &dyn InstalledRepositoryInterface; - // cloning into an owned Box requires clone_box on that trait. - composer - .get_repository_manager() - .get_local_repository() - .clone_box() - }; + return Ok(Self::ERROR_LOCK_OUTDATED); + } + Box::new(composer.get_locker_mut().get_locked_repository(true)?) + } else { + // TODO(phase-b): get_local_repository returns &dyn InstalledRepositoryInterface; + // cloning into an owned Box requires clone_box on that trait. + composer + .get_repository_manager() + .get_local_repository() + .clone_box() + }; if composer.get_package().get_type() != "project" && !dev_only { io.write_error3( @@ -235,9 +234,7 @@ impl BumpCommand { let package_opt = repo.find_package( pkg_name, - crate::repository::repository_interface::FindPackageConstraint::String( - "*".to_string(), - ), + crate::repository::FindPackageConstraint::String("*".to_string()), ); let mut package = match package_opt { None => continue, diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index 73a1f50..40bd898 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -2,22 +2,22 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, strip_tags}; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::link::Link; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::root_package_repository::RootPackageRepository; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::Link; +use crate::repository::InstalledRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RootPackageRepository; struct CheckResult { platform_package: String, @@ -62,9 +62,11 @@ impl CheckPlatformReqsCommand { let mut requires: IndexMap> = IndexMap::new(); let mut remove_packages: Vec = vec![]; - let installed_repo_base: Box< - dyn crate::repository::repository_interface::RepositoryInterface, - > = if input.get_option("lock").as_bool().unwrap_or(false) { + let installed_repo_base: Box = if input + .get_option("lock") + .as_bool() + .unwrap_or(false) + { io.write_error(&format!( "Checking {}platform requirements using the lock file", if no_dev { "non-dev " } else { "" } @@ -78,7 +80,7 @@ impl CheckPlatformReqsCommand { if no_dev { "non-dev " } else { "" } )); Box::new(composer.get_locker_mut().get_locked_repository(!no_dev)?) - as Box + as Box } else { if no_dev { remove_packages = local_repo.get_dev_package_names().clone(); diff --git a/crates/shirabe/src/command/clear_cache_command.rs b/crates/shirabe/src/command/clear_cache_command.rs index c7d6f55..515b0e4 100644 --- a/crates/shirabe/src/command/clear_cache_command.rs +++ b/crates/shirabe/src/command/clear_cache_command.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Command/ClearCacheCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::factory::Factory; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct ClearCacheCommand { diff --git a/crates/shirabe/src/command/config_command.rs b/crates/shirabe/src/command/config_command.rs index 89cfeba..3b9e632 100644 --- a/crates/shirabe/src/command/config_command.rs +++ b/crates/shirabe/src/command/config_command.rs @@ -3,10 +3,10 @@ use crate::io::io_interface; use indexmap::IndexMap; -use crate::console::input::input_option::InputOption; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use crate::console::input::InputOption; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ ArrayObject, InvalidArgumentException, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, JsonObject, PhpMixed, RuntimeException, array_filter, array_filter_use_key, array_is_list, @@ -16,21 +16,21 @@ use shirabe_php_shim::{ strtolower, system, touch, var_export, }; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::base_config_command::BaseConfigCommand; +use crate::advisory::Auditor; +use crate::command::BaseConfigCommand; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::config::json_config_source::JsonConfigSource; -use crate::console::input::input_argument::InputArgument; +use crate::config::ConfigSourceInterface; +use crate::config::JsonConfigSource; +use crate::console::input::InputArgument; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; +use crate::io::IOInterface; +use crate::json::JsonFile; use crate::package::base_package::{self, BasePackage}; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::silencer::Silencer; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::Silencer; use shirabe_semver::version_parser::VersionParser; #[derive(Debug)] diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs index 8e27ab4..6a289ed 100644 --- a/crates/shirabe/src/command/create_project_command.rs +++ b/crates/shirabe/src/command/create_project_command.rs @@ -2,49 +2,49 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::seld::signal::SignalHandler; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, InvalidArgumentException, PhpMixed, RuntimeException, UnexpectedValueException, array_pop, chdir, explode_with_limit, file_exists, getcwd, implode, is_dir, is_file, mkdir, realpath, rtrim, strtolower, unlink, }; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::advisory::Auditor; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::config::json_config_source::JsonConfigSource; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::dependency_resolver::operation::install_operation::InstallOperation; +use crate::config::ConfigSourceInterface; +use crate::config::JsonConfigSource; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::dependency_resolver::operation::InstallOperation; use crate::factory::Factory; -use crate::filter::platform_requirement_filter::ignore_all_platform_requirement_filter::IgnoreAllPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; use crate::installer::Installer; -use crate::installer::project_installer::ProjectInstaller; -use crate::installer::suggested_packages_reporter::SuggestedPackagesReporter; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::{STABILITIES, SUPPORTED_LINK_TYPES}; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::plugin::plugin_blocked_exception::PluginBlockedException; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::installed_array_repository::InstalledArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_set::RepositorySet; -use crate::script::script_events::ScriptEvents; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::installer::ProjectInstaller; +use crate::installer::SuggestedPackagesReporter; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::package::{STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::plugin::PluginBlockedException; +use crate::repository::CompositeRepository; +use crate::repository::InstalledArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryFactory; +use crate::repository::RepositorySet; +use crate::script::ScriptEvents; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::ProcessExecutor; /// Install a package as new project into new directory. #[derive(Debug)] @@ -299,7 +299,7 @@ impl CreateProjectCommand { let _ = &composer_json_repositories_config; let placeholder_existing: IndexMap< String, - Box, + Box, > = IndexMap::new(); let name = RepositoryFactory::generate_repository_name( &PhpMixed::Int(index as i64), @@ -502,7 +502,7 @@ impl CreateProjectCommand { // PHP: $package->{'get'.$meta['method']}() — dynamic getter dispatch // TODO(phase-b): dynamic getter dispatch by name let _method = format!("get{}", meta.method); - let links: Vec = vec![]; + let links: Vec = vec![]; for link in links { if link.get_pretty_constraint().as_deref().ok() == Some("self.version") { config_source.add_link( @@ -888,7 +888,7 @@ impl CreateProjectCommand { package.get_name(), package.get_full_pretty_version( false, - ::DISPLAY_SOURCE_REF_IF_DEV + ::DISPLAY_SOURCE_REF_IF_DEV ) )); @@ -967,7 +967,7 @@ impl CreateProjectCommand { &self, config: &Config, input: &dyn InputInterface, - ) -> Result { + ) -> Result { self.create_audit_config(config, input) } } diff --git a/crates/shirabe/src/command/depends_command.rs b/crates/shirabe/src/command/depends_command.rs index b5901c1..1e702e3 100644 --- a/crates/shirabe/src/command/depends_command.rs +++ b/crates/shirabe/src/command/depends_command.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Command/DependsCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::base_dependency_command::BaseDependencyCommand; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use crate::command::BaseDependencyCommand; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct DependsCommand { @@ -23,7 +23,7 @@ impl DependsCommand { .set_description("Shows which packages cause the given package to be installed") .set_definition(&[ InputArgument::new( - crate::command::base_dependency_command::ARGUMENT_PACKAGE, + crate::command::ARGUMENT_PACKAGE, Some(InputArgument::REQUIRED), "Package to inspect", None, @@ -31,7 +31,7 @@ impl DependsCommand { .unwrap() .into(), InputOption::new( - crate::command::base_dependency_command::OPTION_RECURSIVE, + crate::command::OPTION_RECURSIVE, Some(shirabe_php_shim::PhpMixed::String("r".to_string())), Some(InputOption::VALUE_NONE), "Recursively resolves up to the root package", @@ -40,7 +40,7 @@ impl DependsCommand { .unwrap() .into(), InputOption::new( - crate::command::base_dependency_command::OPTION_TREE, + crate::command::OPTION_TREE, Some(shirabe_php_shim::PhpMixed::String("t".to_string())), Some(InputOption::VALUE_NONE), "Prints the results as a nested tree", diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs index 161f47d..1fdea40 100644 --- a/crates/shirabe/src/command/diagnose_command.rs +++ b/crates/shirabe/src/command/diagnose_command.rs @@ -2,11 +2,11 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::composer::xdebug_handler::xdebug_handler::XdebugHandler; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; use shirabe_php_shim::{ CURL_HTTP_VERSION_2_0, CURL_VERSION_HTTP2, CURL_VERSION_HTTP3, CURL_VERSION_ZSTD, FILTER_VALIDATE_BOOLEAN, INFO_GENERAL, InvalidArgumentException, OPENSSL_VERSION_NUMBER, @@ -18,37 +18,37 @@ use shirabe_php_shim::{ str_contains, str_replace, str_starts_with, strpos, strstr, strtolower, trim, version_compare, }; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::advisory::Auditor; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; use crate::factory::Factory; -use crate::io::buffer_io::BufferIO; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::json::json_file::JsonFile; -use crate::json::json_validation_exception::JsonValidationException; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::locker::Locker; -use crate::package::root_package::RootPackage; -use crate::package::version::version_parser::VersionParser; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::composer_repository::ComposerRepository; -use crate::repository::filesystem_repository::FilesystemRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_set::RepositorySet; -use crate::self_update::keys::Keys; -use crate::self_update::versions::Versions; -use crate::util::config_validator::ConfigValidator; -use crate::util::git::Git; -use crate::util::http::proxy_manager::ProxyManager; -use crate::util::http::request_proxy::RequestProxy; -use crate::util::http_downloader::HttpDownloader; -use crate::util::ini_helper::IniHelper; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::io::BufferIO; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::json::JsonFile; +use crate::json::JsonValidationException; +use crate::package::CompletePackageInterface; +use crate::package::Locker; +use crate::package::RootPackage; +use crate::package::version::VersionParser; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::ComposerRepository; +use crate::repository::FilesystemRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositorySet; +use crate::self_update::Keys; +use crate::self_update::Versions; +use crate::util::ConfigValidator; +use crate::util::Git; +use crate::util::HttpDownloader; +use crate::util::IniHelper; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::http::ProxyManager; +use crate::util::http::RequestProxy; #[derive(Debug)] pub struct DiagnoseCommand { @@ -164,11 +164,12 @@ impl DiagnoseCommand { .map(|(k, v)| (k, *v)) .collect(); let platform_repo = PlatformRepository::new(vec![], platform_overrides_unboxed).unwrap(); - let php_pkg = ::find_package( + let php_pkg = ::find_package( &platform_repo, "php", - crate::repository::repository_interface::FindPackageConstraint::String("*".to_string()), - ).unwrap(); + crate::repository::FindPackageConstraint::String("*".to_string()), + ) + .unwrap(); let mut php_version = php_pkg.get_pretty_version().to_string(); if let Some(cp) = php_pkg.as_complete_package_interface() { if str_contains(&cp.get_description().unwrap_or_default(), "overridden") { @@ -937,9 +938,8 @@ impl DiagnoseCommand { self.http_downloader.clone().unwrap(), None, )?; - let composer_repo_as_repo: Box< - dyn crate::repository::repository_interface::RepositoryInterface, - > = todo!("ComposerRepository as RepositoryInterface"); + let composer_repo_as_repo: Box = + todo!("ComposerRepository as RepositoryInterface"); repo_set.add_repository(composer_repo_as_repo)?; let mut io = BufferIO::new(String::new(), 0, None)?; diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs index a8bef5d..5e883c7 100644 --- a/crates/shirabe/src/command/dump_autoload_command.rs +++ b/crates/shirabe/src/command/dump_autoload_command.rs @@ -1,16 +1,16 @@ //! ref: composer/src/Composer/Command/DumpAutoloadCommand.php use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, file_exists}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; #[derive(Debug)] pub struct DumpAutoloadCommand { diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index c6322ab..198bdb1 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Command/ExecCommand.php use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, basename, chdir, getcwd, glob}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; #[derive(Debug)] pub struct ExecCommand { diff --git a/crates/shirabe/src/command/fund_command.rs b/crates/shirabe/src/command/fund_command.rs index e7de085..058e5af 100644 --- a/crates/shirabe/src/command/fund_command.rs +++ b/crates/shirabe/src/command/fund_command.rs @@ -4,26 +4,26 @@ use std::any::Any; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::PhpMixed; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::repository::CompositeRepository; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct FundCommand { @@ -86,7 +86,7 @@ impl FundCommand { ); // collect funding data from default branches - for package in &result.packages { + for (_, package) in &result.packages { if package.as_any().downcast_ref::().is_none() { // TODO: check for CompleteAliasPackage as well if let Some(complete_pkg) = package.as_any().downcast_ref::() { diff --git a/crates/shirabe/src/command/global_command.rs b/crates/shirabe/src/command/global_command.rs index 613d6e4..27dec6a 100644 --- a/crates/shirabe/src/command/global_command.rs +++ b/crates/shirabe/src/command/global_command.rs @@ -3,19 +3,19 @@ use std::path::Path; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::input::string_input::StringInput; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::input::StringInput; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{LogicException, RuntimeException, chdir}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; +use crate::console::input::InputArgument; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::io::IOInterface; +use crate::util::Filesystem; +use crate::util::Platform; #[derive(Debug)] pub struct GlobalCommand { diff --git a/crates/shirabe/src/command/home_command.rs b/crates/shirabe/src/command/home_command.rs index cd13962..6f3ac5c 100644 --- a/crates/shirabe/src/command/home_command.rs +++ b/crates/shirabe/src/command/home_command.rs @@ -1,23 +1,23 @@ //! ref: composer/src/Composer/Command/HomeCommand.php use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{FILTER_VALIDATE_URL, PhpMixed, filter_var}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryFactory; +use crate::repository::RepositoryInterface; +use crate::repository::RootPackageRepository; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct HomeCommand { diff --git a/crates/shirabe/src/command/init_command.rs b/crates/shirabe/src/command/init_command.rs index 9e9bad0..eb6983f 100644 --- a/crates/shirabe/src/command/init_command.rs +++ b/crates/shirabe/src/command/init_command.rs @@ -3,12 +3,12 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; -use shirabe_external_packages::symfony::component::console::helper::formatter_helper::FormatterHelper; -use shirabe_external_packages::symfony::component::console::input::array_input::ArrayInput; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; +use shirabe_external_packages::symfony::component::console::helper::FormatterHelper; +use shirabe_external_packages::symfony::component::console::input::ArrayInput; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ FILE_IGNORE_NEW_LINES, FILTER_VALIDATE_EMAIL, InvalidArgumentException, PHP_EOL, PhpMixed, array_filter, array_flip, array_flip_strings, array_intersect_key, array_keys, array_map, @@ -17,21 +17,21 @@ use shirabe_php_shim::{ server_get, sprintf, str_replace, strpos, strtolower, trim, ucwords, }; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::package_discovery_trait::PackageDiscoveryTrait; +use crate::command::PackageDiscoveryTrait; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_validation_exception::JsonValidationException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::json::JsonValidationException; use crate::package::base_package::{self, BasePackage}; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; +use crate::repository::CompositeRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryFactory; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; +use crate::util::Silencer; #[derive(Debug)] pub struct InitCommand { @@ -48,7 +48,7 @@ impl PackageDiscoveryTrait for InitCommand { fn get_repository_sets_mut( &mut self, - ) -> &mut IndexMap { + ) -> &mut IndexMap { todo!() } @@ -71,7 +71,8 @@ impl PackageDiscoveryTrait for InitCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box{ + ) -> Box + { todo!() } @@ -450,9 +451,8 @@ impl InitCommand { io.load_configuration(&mut *config.borrow_mut())?; let mut repo_manager = RepositoryFactory::manager(io, &config, None, None, None)?; - let mut repos: Vec< - Box, - > = vec![Box::new(PlatformRepository::new(vec![], IndexMap::new())?)]; + let mut repos: Vec> = + vec![Box::new(PlatformRepository::new(vec![], IndexMap::new())?)]; let mut create_default_packagist_repo = true; for repo in &repositories { let repo_config = RepositoryFactory::config_from_string(io, &config, repo, true)?; diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 02ba28d..666833d 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -1,19 +1,19 @@ //! ref: composer/src/Composer/Command/InstallCommand.php use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::advisory::Auditor; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::installer::Installer; -use crate::io::io_interface::IOInterface; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::util::http_downloader::HttpDownloader; +use crate::io::IOInterface; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::util::HttpDownloader; #[derive(Debug)] pub struct InstallCommand { diff --git a/crates/shirabe/src/command/licenses_command.rs b/crates/shirabe/src/command/licenses_command.rs index e041f5c..0c00ed6 100644 --- a/crates/shirabe/src/command/licenses_command.rs +++ b/crates/shirabe/src/command/licenses_command.rs @@ -4,29 +4,29 @@ use std::any::Any; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::helper::table::Table; -use shirabe_external_packages::symfony::console::style::symfony_style::SymfonyStyle; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; +use shirabe_external_packages::symfony::console::helper::Table; +use shirabe_external_packages::symfony::console::style::SymfonyStyle; use shirabe_php_shim::{PhpMixed, RuntimeException, UnexpectedValueException}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::base_package::BasePackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_utils::RepositoryUtils; -use crate::util::package_info::PackageInfo; -use crate::util::package_sorter::PackageSorter; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::RepositoryInterface; +use crate::repository::RepositoryUtils; +use crate::util::PackageInfo; +use crate::util::PackageSorter; #[derive(Debug)] pub struct LicensesCommand { @@ -104,7 +104,7 @@ impl LicensesCommand { } let no_dev = input.get_option("no-dev").as_bool().unwrap_or(false); let repo = locker.get_locked_repository(!no_dev)?; - ::get_packages(&repo) + ::get_packages(&repo) } else { let repo = composer.get_repository_manager().get_local_repository(); if input.get_option("no-dev").as_bool().unwrap_or(false) { @@ -121,7 +121,7 @@ impl LicensesCommand { let _ = composer.get_package(); // TODO(phase-b): convert BasePackage trait objects to PackageInterface for sorting. - let pkg_pi: Vec> = packages + let pkg_pi: Vec> = packages .into_iter() .map(|p| p.clone_package_box()) .collect(); diff --git a/crates/shirabe/src/command/mod.rs b/crates/shirabe/src/command/mod.rs index 9761805..614fff7 100644 --- a/crates/shirabe/src/command/mod.rs +++ b/crates/shirabe/src/command/mod.rs @@ -36,3 +36,42 @@ pub mod status_command; pub mod suggests_command; pub mod update_command; pub mod validate_command; + +pub use about_command::*; +pub use archive_command::*; +pub use audit_command::*; +pub use base_command::*; +pub use base_config_command::*; +pub use base_dependency_command::*; +pub use bump_command::*; +pub use check_platform_reqs_command::*; +pub use clear_cache_command::*; +pub use completion_trait::*; +pub use config_command::*; +pub use create_project_command::*; +pub use depends_command::*; +pub use diagnose_command::*; +pub use dump_autoload_command::*; +pub use exec_command::*; +pub use fund_command::*; +pub use global_command::*; +pub use home_command::*; +pub use init_command::*; +pub use install_command::*; +pub use licenses_command::*; +pub use outdated_command::*; +pub use package_discovery_trait::*; +pub use prohibits_command::*; +pub use reinstall_command::*; +pub use remove_command::*; +pub use repository_command::*; +pub use require_command::*; +pub use run_script_command::*; +pub use script_alias_command::*; +pub use search_command::*; +pub use self_update_command::*; +pub use show_command::*; +pub use status_command::*; +pub use suggests_command::*; +pub use update_command::*; +pub use validate_command::*; diff --git a/crates/shirabe/src/command/outdated_command.rs b/crates/shirabe/src/command/outdated_command.rs index 3a2b05b..c4d9e89 100644 --- a/crates/shirabe/src/command/outdated_command.rs +++ b/crates/shirabe/src/command/outdated_command.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Command/OutdatedCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::input::array_input::ArrayInput; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::input::ArrayInput; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 886c243..f273811 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -5,9 +5,9 @@ use std::any::Any; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PHP_EOL, PhpMixed, array_keys, array_slice, array_unshift, array_values, asort, count, explode, file_get_contents, implode, in_array, @@ -17,20 +17,20 @@ use shirabe_php_shim::{ use crate::composer::Composer; use crate::factory::Factory; -use crate::filter::platform_requirement_filter::ignore_all_platform_requirement_filter::IgnoreAllPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::io::io_interface::IOInterface; -use crate::package::base_package::BasePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_interface::{RepositoryInterface, SearchResult}; -use crate::repository::repository_set::RepositorySet; -use crate::util::filesystem::Filesystem; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::io::IOInterface; +use crate::package::BasePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::repository::CompositeRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryFactory; +use crate::repository::RepositorySet; +use crate::repository::{RepositoryInterface, SearchResult}; +use crate::util::Filesystem; /// @internal pub trait PackageDiscoveryTrait { @@ -50,16 +50,14 @@ pub trait PackageDiscoveryTrait { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box; + ) -> Box; fn normalize_requirements(&self, requires: Vec) -> Vec>; fn get_repos(&mut self) -> &CompositeRepository { if self.get_repos_mut().is_none() { // PHP: array_merge([new PlatformRepository], RepositoryFactory::defaultReposWithDefaultManager($this->getIO())) - let mut repos: Vec< - Box, - > = vec![ + let mut repos: Vec> = vec![ // TODO(phase-b): PlatformRepository::new() signature Box::new(todo!("PlatformRepository::new()") as PlatformRepository), ]; @@ -274,10 +272,8 @@ pub trait PackageDiscoveryTrait { // no match, prompt which to pick if !exact_match { // TODO(phase-b): self.get_repos() (&mut self) conflicts with io borrow (&self) - let providers: IndexMap< - String, - crate::repository::repository_interface::ProviderInfo, - > = todo!("self.get_repos().get_providers()"); + let providers: IndexMap = + todo!("self.get_repos().get_providers()"); if count(&PhpMixed::List( providers.iter().map(|_| Box::new(PhpMixed::Null)).collect(), )) > 0 @@ -299,13 +295,10 @@ pub trait PackageDiscoveryTrait { let mut abandoned = String::new(); if let Some(ai) = &found_package.abandoned { let replacement = match ai { - crate::repository::repository_interface::AbandonedInfo::Replacement(r) => { - sprintf( - "Use %s instead", - &[PhpMixed::String(r.clone())], - ) + crate::repository::AbandonedInfo::Replacement(r) => { + sprintf("Use %s instead", &[PhpMixed::String(r.clone())]) } - crate::repository::repository_interface::AbandonedInfo::Abandoned => { + crate::repository::AbandonedInfo::Abandoned => { "No replacement was suggested".to_string() } }; @@ -820,9 +813,7 @@ pub trait PackageDiscoveryTrait { if installed_repo .find_package( &result.name, - crate::repository::repository_interface::FindPackageConstraint::String( - "*".to_string(), - ), + crate::repository::FindPackageConstraint::String("*".to_string()), ) .is_some() { @@ -853,9 +844,7 @@ pub trait PackageDiscoveryTrait { } let platform_pkg = platform_repo.find_package( link.get_target(), - crate::repository::repository_interface::FindPackageConstraint::String( - "*".to_string(), - ), + crate::repository::FindPackageConstraint::String("*".to_string()), ); let platform_pkg = match platform_pkg { None => { @@ -881,12 +870,13 @@ pub trait PackageDiscoveryTrait { } Some(p) => p, }; - if !link.get_constraint().matches( - &shirabe_semver::constraint::constraint::Constraint::new( + if !link + .get_constraint() + .matches(&shirabe_semver::constraint::Constraint::new( "==", platform_pkg.get_version(), - ), - ) { + )) + { let mut platform_pkg_version = platform_pkg.get_pretty_version().to_string(); let platform_extra = platform_pkg.get_extra(); let has_config_platform = platform_extra.contains_key("config.platform"); diff --git a/crates/shirabe/src/command/prohibits_command.rs b/crates/shirabe/src/command/prohibits_command.rs index 15f74fd..9b8132b 100644 --- a/crates/shirabe/src/command/prohibits_command.rs +++ b/crates/shirabe/src/command/prohibits_command.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Command/ProhibitsCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::base_dependency_command::BaseDependencyCommand; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use crate::command::BaseDependencyCommand; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct ProhibitsCommand { diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index 807183b..3e985a4 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -3,28 +3,28 @@ use std::any::Any; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::InvalidArgumentException; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; +use crate::console::input::InputArgument; use crate::console::input::InputDefinitionItem; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::transaction::Transaction; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; +use crate::console::input::InputOption; +use crate::dependency_resolver::Transaction; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::PackageInterface; use crate::package::base_package; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::script::script_events::ScriptEvents; -use crate::util::platform::Platform; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::script::ScriptEvents; +use crate::util::Platform; #[derive(Debug)] pub struct ReinstallCommand { @@ -71,9 +71,7 @@ impl ReinstallCommand { let io = self.get_io(); let local_repo = composer.get_repository_manager().get_local_repository(); - let mut packages_to_reinstall: Vec< - Box, - > = vec![]; + let mut packages_to_reinstall: Vec> = vec![]; let mut package_names_to_reinstall: Vec = vec![]; let type_option = input.get_option("type"); diff --git a/crates/shirabe/src/command/remove_command.rs b/crates/shirabe/src/command/remove_command.rs index 8e2eac2..dbffcea 100644 --- a/crates/shirabe/src/command/remove_command.rs +++ b/crates/shirabe/src/command/remove_command.rs @@ -1,27 +1,27 @@ //! ref: composer/src/Composer/Command/RemoveCommand.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::exception::invalid_argument_exception::InvalidArgumentException; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::exception::InvalidArgumentException; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, UnexpectedValueException, array_map, strtolower}; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::advisory::Auditor; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::config::json_config_source::JsonConfigSource; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::dependency_resolver::request::Request; +use crate::config::ConfigSourceInterface; +use crate::config::JsonConfigSource; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::dependency_resolver::Request; use crate::factory::Factory; use crate::installer::Installer; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; use crate::package::base_package; -use crate::package::base_package::BasePackage; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; +use crate::repository::CanonicalPackagesTrait; #[derive(Debug)] pub struct RemoveCommand { @@ -458,8 +458,8 @@ impl RemoveCommand { } // TODO(plugin): dispatch CommandEvent(PluginEvents::COMMAND, 'remove', input, output) - let command_event = crate::plugin::command_event::CommandEvent::new( - crate::plugin::plugin_events::PluginEvents::COMMAND, + let command_event = crate::plugin::CommandEvent::new( + crate::plugin::PluginEvents::COMMAND, "remove", input, output, diff --git a/crates/shirabe/src/command/repository_command.rs b/crates/shirabe/src/command/repository_command.rs index 306c52f..dce57b5 100644 --- a/crates/shirabe/src/command/repository_command.rs +++ b/crates/shirabe/src/command/repository_command.rs @@ -1,24 +1,24 @@ //! ref: composer/src/Composer/Command/RepositoryCommand.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PHP_URL_HOST, PhpMixed, RuntimeException, parse_url, strtolower, }; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::base_config_command::BaseConfigCommand; +use crate::command::BaseConfigCommand; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::config::json_config_source::JsonConfigSource; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::config::ConfigSourceInterface; +use crate::config::JsonConfigSource; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; +use crate::io::IOInterface; +use crate::json::JsonFile; #[derive(Debug)] pub struct RepositoryCommand { diff --git a/crates/shirabe/src/command/require_command.rs b/crates/shirabe/src/command/require_command.rs index e5963e4..5f4e27a 100644 --- a/crates/shirabe/src/command/require_command.rs +++ b/crates/shirabe/src/command/require_command.rs @@ -3,10 +3,10 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::seld::signal::SignalHandler; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ PhpMixed, RuntimeException, UnexpectedValueException, array_fill_keys, array_intersect, array_keys, array_map, array_merge, array_merge_recursive, array_unique, count, empty, @@ -14,36 +14,36 @@ use shirabe_php_shim::{ strtolower, unlink, }; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::package_discovery_trait::PackageDiscoveryTrait; +use crate::advisory::Auditor; +use crate::command::PackageDiscoveryTrait; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::dependency_resolver::request::Request; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::dependency_resolver::Request; use crate::factory::Factory; use crate::installer::Installer; -use crate::installer::installer_events::InstallerEvents; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_manipulator::JsonManipulator; -use crate::package::alias_package::AliasPackage; +use crate::installer::InstallerEvents; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::json::JsonManipulator; +use crate::package::AliasPackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::root_package_loader::RootPackageLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; -use crate::util::filesystem::Filesystem; -use crate::util::package_sorter::PackageSorter; -use crate::util::silencer::Silencer; +use crate::package::loader::ArrayLoader; +use crate::package::loader::RootPackageLoader; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CompositeRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; +use crate::util::Filesystem; +use crate::util::PackageSorter; +use crate::util::Silencer; #[derive(Debug)] pub struct RequireCommand { @@ -89,7 +89,8 @@ impl PackageDiscoveryTrait for RequireCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box{ + ) -> Box + { todo!() } @@ -259,9 +260,7 @@ impl RequireCommand { .unwrap_or_default(); // initialize self.repos as it is used by the PackageDiscoveryTrait let platform_repo = PlatformRepository::new(vec![], platform_overrides_map)?; - let mut combined: Vec< - Box, - > = vec![ + let mut combined: Vec> = vec![ // TODO(phase-b): PlatformRepository should be shared via Rc; use placeholder until // CompositeRepository accepts shared references Box::new(todo!("share platform_repo with PlatformRepository") as PlatformRepository), @@ -691,13 +690,13 @@ impl RequireCommand { // self.dependency_resolution_completed = true when invoked. composer.get_event_dispatcher().borrow_mut().add_listener( InstallerEvents::PRE_OPERATIONS_EXEC, - crate::event_dispatcher::event_dispatcher::Callable::Closure, + crate::event_dispatcher::Callable::Closure, 10000, ); if input.get_option("dry-run").as_bool().unwrap_or(false) { let root_package = composer.get_package(); - let mut links: IndexMap> = + let mut links: IndexMap> = IndexMap::new(); links.insert("require".to_string(), root_package.get_requires()); links.insert("require-dev".to_string(), root_package.get_dev_requires()); @@ -948,9 +947,7 @@ impl RequireCommand { for package_name in requirements_to_update { let mut package = repo.find_package( package_name, - crate::repository::repository_interface::FindPackageConstraint::String( - "*".to_string(), - ), + crate::repository::FindPackageConstraint::String("*".to_string()), ); // TODO(phase-b): `$package instanceof AliasPackage` downcast let package_as_alias: Option<&AliasPackage> = None; diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index ff48658..8121feb 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -2,19 +2,19 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException}; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::script::event::Event as ScriptEvent; -use crate::script::script_events::ScriptEvents; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::script::Event as ScriptEvent; +use crate::script::ScriptEvents; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RunScriptCommand { diff --git a/crates/shirabe/src/command/script_alias_command.rs b/crates/shirabe/src/command/script_alias_command.rs index e0ab5c9..a054631 100644 --- a/crates/shirabe/src/command/script_alias_command.rs +++ b/crates/shirabe/src/command/script_alias_command.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Command/ScriptAliasCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::util::platform::Platform; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::util::Platform; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{InvalidArgumentException, LogicException, PhpMixed, is_string}; #[derive(Debug)] diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs index 0b5cc21..16df221 100644 --- a/crates/shirabe/src/command/search_command.rs +++ b/crates/shirabe/src/command/search_command.rs @@ -1,21 +1,21 @@ //! ref: composer/src/Composer/Command/SearchCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::platform_repository::PlatformRepository; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CompositeRepository; +use crate::repository::PlatformRepository; use crate::repository::repository_interface::{self, RepositoryInterface}; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, implode, in_array, preg_quote}; #[derive(Debug)] diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index f0b0ca3..ccfbe07 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -3,10 +3,10 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ InvalidArgumentException, OPENSSL_ALGO_SHA384, PHP_EOL, PHP_VERSION_ID, Phar, PharException, PhpMixed, RuntimeException, UnexpectedValueException, array_map, base64_decode, @@ -19,18 +19,18 @@ use shirabe_php_shim::{ usleep, version_compare, }; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; use crate::config::Config; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::downloader::filesystem_exception::FilesystemException; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::downloader::FilesystemException; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::self_update::keys::Keys; -use crate::self_update::versions::Versions; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::io::IOInterface; +use crate::self_update::Keys; +use crate::self_update::Versions; +use crate::util::Filesystem; +use crate::util::Platform; #[derive(Debug)] pub struct SelfUpdateCommand { diff --git a/crates/shirabe/src/command/show_command.rs b/crates/shirabe/src/command/show_command.rs index 53ab934..ae386ac 100644 --- a/crates/shirabe/src/command/show_command.rs +++ b/crates/shirabe/src/command/show_command.rs @@ -1,48 +1,48 @@ //! ref: composer/src/Composer/Command/ShowCommand.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::composer::semver::semver::Semver; -use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; -use shirabe_external_packages::symfony::console::formatter::output_formatter_style::OutputFormatterStyle; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::composer::semver::Semver; +use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; +use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, UnexpectedValueException, array_search, date, extension_loaded, in_array, realpath, strtolower, version_compare, }; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::dependency_resolver::default_policy::DefaultPolicy; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; +use crate::console::input::InputOption; +use crate::dependency_resolver::DefaultPolicy; +use crate::dependency_resolver::PolicyInterface; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; use crate::package::base_package; -use crate::package::base_package::BasePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::filter_repository::FilterRepository; -use crate::repository::installed_array_repository::InstalledArrayRepository; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; -use crate::repository::repository_utils::RepositoryUtils; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::package_info::PackageInfo; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CompositeRepository; +use crate::repository::FilterRepository; +use crate::repository::InstalledArrayRepository; +use crate::repository::InstalledRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryFactory; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; +use crate::repository::RepositoryUtils; +use crate::repository::RootPackageRepository; +use crate::util::PackageInfo; // keep InputOption referenced; the configure() definition list is currently abbreviated #[allow(dead_code)] diff --git a/crates/shirabe/src/command/status_command.rs b/crates/shirabe/src/command/status_command.rs index b62b4d6..801d2c6 100644 --- a/crates/shirabe/src/command/status_command.rs +++ b/crates/shirabe/src/command/status_command.rs @@ -2,20 +2,20 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_option::InputOption; -use crate::io::io_interface::IOInterface; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::script::script_events::ScriptEvents; -use crate::util::process_executor::ProcessExecutor; +use crate::console::input::InputOption; +use crate::io::IOInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::script::ScriptEvents; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct StatusCommand { @@ -119,7 +119,7 @@ impl StatusCommand { }; // TODO(phase-b): downloader borrow lifetime tied to dm.borrow() temporary; restructure later. let dm_borrow = dm.borrow(); - let downloader: &dyn crate::downloader::downloader_interface::DownloaderInterface = + let downloader: &dyn crate::downloader::DownloaderInterface = match dm_borrow.get_downloader_for_package(package.as_ref())? { Some(d) => d, None => continue, diff --git a/crates/shirabe/src/command/suggests_command.rs b/crates/shirabe/src/command/suggests_command.rs index 3b114c7..9d5897c 100644 --- a/crates/shirabe/src/command/suggests_command.rs +++ b/crates/shirabe/src/command/suggests_command.rs @@ -1,19 +1,19 @@ //! ref: composer/src/Composer/Command/SuggestsCommand.php -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; -use crate::installer::suggested_packages_reporter::SuggestedPackagesReporter; -use crate::io::io_interface::IOInterface; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::root_package_repository::RootPackageRepository; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; +use crate::installer::SuggestedPackagesReporter; +use crate::io::IOInterface; +use crate::repository::InstalledRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RootPackageRepository; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{PhpMixed, empty, in_array}; #[derive(Debug)] @@ -89,7 +89,7 @@ impl SuggestsCommand { let filter = input.get_argument("packages"); let mut packages = RepositoryInterface::get_packages(&installed_repo); // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface; pushing into Vec> requires conversion - let root_pkg_as_base: Box = + let root_pkg_as_base: Box = todo!("convert RootPackageInterface to Box"); packages.push(root_pkg_as_base); for package in &packages { @@ -120,7 +120,7 @@ impl SuggestsCommand { mode = SuggestedPackagesReporter::MODE_LIST; } - let only_dependents_of: Option<&dyn crate::package::package_interface::PackageInterface> = + let only_dependents_of: Option<&dyn crate::package::PackageInterface> = if empty(&filter) && !input.get_option("all").as_bool().unwrap_or(false) { // TODO(phase-b): composer.get_package() returns &dyn RootPackageInterface; need conversion to &dyn PackageInterface Some(todo!( diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index 2e8b993..3595066 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -4,38 +4,38 @@ use crate::io::io_interface; use crate::package::base_package; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::helper::table::Table; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::helper::Table; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_intersect, array_keys, array_merge, array_search, count, empty, in_array, sprintf, strtolower, }; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::intervals::Intervals; -use crate::advisory::auditor::Auditor; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::command::bump_command::BumpCommand; +use crate::advisory::Auditor; +use crate::command::BumpCommand; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::dependency_resolver::request::{self, Request, UpdateAllowTransitiveDeps}; use crate::installer::Installer; -use crate::io::io_interface::IOInterface; -use crate::package::base_package::BasePackage; -use crate::package::loader::root_package_loader::RootPackageLoader; -use crate::package::version::version_parser::VersionParser; -use crate::package::version::version_selector::VersionSelector; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; -use crate::util::http_downloader::HttpDownloader; +use crate::io::IOInterface; +use crate::package::BasePackage; +use crate::package::loader::RootPackageLoader; +use crate::package::version::VersionParser; +use crate::package::version::VersionSelector; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::CompositeRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; +use crate::util::HttpDownloader; #[derive(Debug)] pub struct UpdateCommand { @@ -199,7 +199,7 @@ impl UpdateCommand { package, package, constraint, )); - return Ok(crate::command::base_command::FAILURE); + return Ok(crate::command::FAILURE); } } } @@ -494,7 +494,7 @@ impl UpdateCommand { // TODO(phase-b): unify return types — CanonicalPackagesTrait returns // Vec> while RepositoryInterface::get_packages // returns Vec>. Use only the locker branch for now. - let installed_packages: Vec> = + let installed_packages: Vec> = if composer.get_locker().is_locked() { CanonicalPackagesTrait::get_packages( &composer.get_locker().get_locked_repository(true)?, diff --git a/crates/shirabe/src/command/validate_command.rs b/crates/shirabe/src/command/validate_command.rs index a15c819..d6ee3aa 100644 --- a/crates/shirabe/src/command/validate_command.rs +++ b/crates/shirabe/src/command/validate_command.rs @@ -1,20 +1,20 @@ //! ref: composer/src/Composer/Command/ValidateCommand.php use anyhow::Result; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; -use shirabe_external_packages::symfony::component::console::output::output_interface::OutputInterface; +use shirabe_external_packages::symfony::component::console::input::InputInterface; +use shirabe_external_packages::symfony::component::console::output::OutputInterface; -use crate::command::base_command::{BaseCommand, BaseCommandData, HasBaseCommandData}; +use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; use crate::composer::Composer; -use crate::console::input::input_argument::InputArgument; -use crate::console::input::input_option::InputOption; +use crate::console::input::InputArgument; +use crate::console::input::InputOption; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::plugin_events::PluginEvents; -use crate::util::config_validator::ConfigValidator; -use crate::util::filesystem::Filesystem; +use crate::io::IOInterface; +use crate::package::loader::ValidatingArrayLoader; +use crate::plugin::CommandEvent; +use crate::plugin::PluginEvents; +use crate::util::ConfigValidator; +use crate::util::Filesystem; #[derive(Debug)] pub struct ValidateCommand { -- cgit v1.3.1