diff options
364 files changed, 2969 insertions, 2607 deletions
diff --git a/crates/shirabe-class-map-generator/src/class_map.rs b/crates/shirabe-class-map-generator/src/class_map.rs index c397c5c..10e7869 100644 --- a/crates/shirabe-class-map-generator/src/class_map.rs +++ b/crates/shirabe-class-map-generator/src/class_map.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/class-map-generator/src/ClassMap.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{Countable, OutOfBoundsException, rtrim, strpos, strtr}; #[derive(Debug, Clone)] diff --git a/crates/shirabe-class-map-generator/src/class_map_generator.rs b/crates/shirabe-class-map-generator/src/class_map_generator.rs index a49ce66..817e578 100644 --- a/crates/shirabe-class-map-generator/src/class_map_generator.rs +++ b/crates/shirabe-class-map-generator/src/class_map_generator.rs @@ -4,9 +4,9 @@ use crate::class_map::ClassMap; use crate::file_list::FileList; use crate::php_file_parser::PhpFileParser; use indexmap::indexmap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::finder::finder::Finder; -use shirabe_external_packages::symfony::component::finder::spl_file_info::SplFileInfo; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::finder::Finder; +use shirabe_external_packages::symfony::component::finder::SplFileInfo; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, InvalidArgumentException, LogicException, PATHINFO_EXTENSION, PHP_INT_MAX, PhpMixed, RuntimeException, explode, getcwd, implode, in_array, is_dir, is_file, is_string, diff --git a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs index 98c8b1d..5505b7d 100644 --- a/crates/shirabe-class-map-generator/src/php_file_cleaner.rs +++ b/crates/shirabe-class-map-generator/src/php_file_cleaner.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/class-map-generator/src/PhpFileCleaner.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::preg_quote; use std::sync::Mutex; diff --git a/crates/shirabe-class-map-generator/src/php_file_parser.rs b/crates/shirabe-class-map-generator/src/php_file_parser.rs index 95b2997..d196f8b 100644 --- a/crates/shirabe-class-map-generator/src/php_file_parser.rs +++ b/crates/shirabe-class-map-generator/src/php_file_parser.rs @@ -3,7 +3,7 @@ use crate::php_file_cleaner::PhpFileCleaner; use anyhow::anyhow; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ HHVM_VERSION, PHP_EOL, PHP_VERSION_ID, RuntimeException, error_get_last, file_exists, file_get_contents, function_exists, is_file, is_readable, ltrim, php_strip_whitespace, sprintf, diff --git a/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs b/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs index a0db297..534de01 100644 --- a/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs +++ b/crates/shirabe-external-packages/src/composer/ca_bundle/ca_bundle.rs @@ -1,4 +1,4 @@ -use crate::psr::log::logger_interface::LoggerInterface; +use crate::psr::log::LoggerInterface; #[derive(Debug)] pub struct CaBundle; diff --git a/crates/shirabe-external-packages/src/composer/ca_bundle/mod.rs b/crates/shirabe-external-packages/src/composer/ca_bundle/mod.rs index 537fe0d..2a32509 100644 --- a/crates/shirabe-external-packages/src/composer/ca_bundle/mod.rs +++ b/crates/shirabe-external-packages/src/composer/ca_bundle/mod.rs @@ -1 +1,3 @@ pub mod ca_bundle; + +pub use ca_bundle::*; diff --git a/crates/shirabe-external-packages/src/composer/metadata_minifier/mod.rs b/crates/shirabe-external-packages/src/composer/metadata_minifier/mod.rs index fb69bd5..d14cace 100644 --- a/crates/shirabe-external-packages/src/composer/metadata_minifier/mod.rs +++ b/crates/shirabe-external-packages/src/composer/metadata_minifier/mod.rs @@ -1 +1,3 @@ pub mod metadata_minifier; + +pub use metadata_minifier::*; diff --git a/crates/shirabe-external-packages/src/composer/mod.rs b/crates/shirabe-external-packages/src/composer/mod.rs index 61e5544..e5cccdb 100644 --- a/crates/shirabe-external-packages/src/composer/mod.rs +++ b/crates/shirabe-external-packages/src/composer/mod.rs @@ -5,3 +5,11 @@ pub mod semver; pub mod spdx_licenses; pub mod util; pub mod xdebug_handler; + +pub use ca_bundle::*; +pub use metadata_minifier::*; +pub use pcre::*; +pub use semver::*; +pub use spdx_licenses::*; +pub use util::*; +pub use xdebug_handler::*; diff --git a/crates/shirabe-external-packages/src/composer/pcre/mod.rs b/crates/shirabe-external-packages/src/composer/pcre/mod.rs index 5cc1656..20c37d0 100644 --- a/crates/shirabe-external-packages/src/composer/pcre/mod.rs +++ b/crates/shirabe-external-packages/src/composer/pcre/mod.rs @@ -1 +1,3 @@ pub mod preg; + +pub use preg::*; diff --git a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs b/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs index dc27a32..246c4e5 100644 --- a/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs +++ b/crates/shirabe-external-packages/src/composer/semver/compiling_matcher.rs @@ -1,4 +1,4 @@ -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct CompilingMatcher; diff --git a/crates/shirabe-external-packages/src/composer/semver/intervals.rs b/crates/shirabe-external-packages/src/composer/semver/intervals.rs index 04f7ee7..ff04cd8 100644 --- a/crates/shirabe-external-packages/src/composer/semver/intervals.rs +++ b/crates/shirabe-external-packages/src/composer/semver/intervals.rs @@ -1,5 +1,5 @@ use shirabe_php_shim::PhpMixed; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct Intervals; diff --git a/crates/shirabe-external-packages/src/composer/semver/mod.rs b/crates/shirabe-external-packages/src/composer/semver/mod.rs index 800150d..fc6c9c4 100644 --- a/crates/shirabe-external-packages/src/composer/semver/mod.rs +++ b/crates/shirabe-external-packages/src/composer/semver/mod.rs @@ -1,3 +1,7 @@ pub mod compiling_matcher; pub mod intervals; pub mod semver; + +pub use compiling_matcher::*; +pub use intervals::*; +pub use semver::*; diff --git a/crates/shirabe-external-packages/src/composer/spdx_licenses/mod.rs b/crates/shirabe-external-packages/src/composer/spdx_licenses/mod.rs index a4b5b0a..5a01abc 100644 --- a/crates/shirabe-external-packages/src/composer/spdx_licenses/mod.rs +++ b/crates/shirabe-external-packages/src/composer/spdx_licenses/mod.rs @@ -1 +1,3 @@ pub mod spdx_licenses; + +pub use spdx_licenses::*; diff --git a/crates/shirabe-external-packages/src/composer/util/mod.rs b/crates/shirabe-external-packages/src/composer/util/mod.rs index 3048d03..02c41b6 100644 --- a/crates/shirabe-external-packages/src/composer/util/mod.rs +++ b/crates/shirabe-external-packages/src/composer/util/mod.rs @@ -1 +1,3 @@ pub mod composer_mirror; + +pub use composer_mirror::*; diff --git a/crates/shirabe-external-packages/src/composer/xdebug_handler/mod.rs b/crates/shirabe-external-packages/src/composer/xdebug_handler/mod.rs index cd8b96e..c95f237 100644 --- a/crates/shirabe-external-packages/src/composer/xdebug_handler/mod.rs +++ b/crates/shirabe-external-packages/src/composer/xdebug_handler/mod.rs @@ -1 +1,3 @@ pub mod xdebug_handler; + +pub use xdebug_handler::*; diff --git a/crates/shirabe-external-packages/src/json_schema/mod.rs b/crates/shirabe-external-packages/src/json_schema/mod.rs index fa199f2..49febb8 100644 --- a/crates/shirabe-external-packages/src/json_schema/mod.rs +++ b/crates/shirabe-external-packages/src/json_schema/mod.rs @@ -1 +1,3 @@ pub mod validator; + +pub use validator::*; diff --git a/crates/shirabe-external-packages/src/psr/log/mod.rs b/crates/shirabe-external-packages/src/psr/log/mod.rs index ce220bc..17d71b7 100644 --- a/crates/shirabe-external-packages/src/psr/log/mod.rs +++ b/crates/shirabe-external-packages/src/psr/log/mod.rs @@ -1,2 +1,5 @@ pub mod log_level; pub mod logger_interface; + +pub use log_level::*; +pub use logger_interface::*; diff --git a/crates/shirabe-external-packages/src/psr/mod.rs b/crates/shirabe-external-packages/src/psr/mod.rs index f4ee9bc..1e6bbb8 100644 --- a/crates/shirabe-external-packages/src/psr/mod.rs +++ b/crates/shirabe-external-packages/src/psr/mod.rs @@ -1 +1,3 @@ pub mod log; + +pub use log::*; diff --git a/crates/shirabe-external-packages/src/react/mod.rs b/crates/shirabe-external-packages/src/react/mod.rs index c97841f..fbd3c38 100644 --- a/crates/shirabe-external-packages/src/react/mod.rs +++ b/crates/shirabe-external-packages/src/react/mod.rs @@ -1 +1,3 @@ pub mod promise; + +pub use promise::*; diff --git a/crates/shirabe-external-packages/src/react/promise/mod.rs b/crates/shirabe-external-packages/src/react/promise/mod.rs index 5f1195f..00b63b2 100644 --- a/crates/shirabe-external-packages/src/react/promise/mod.rs +++ b/crates/shirabe-external-packages/src/react/promise/mod.rs @@ -1,7 +1,9 @@ pub mod promise; pub mod promise_interface; -use self::promise_interface::PromiseInterface; +pub use promise::*; +pub use promise_interface::*; + use shirabe_php_shim::PhpMixed; pub fn resolve(_value: Option<PhpMixed>) -> Box<dyn PromiseInterface> { diff --git a/crates/shirabe-external-packages/src/react/promise/promise.rs b/crates/shirabe-external-packages/src/react/promise/promise.rs index 9407b57..5cfc236 100644 --- a/crates/shirabe-external-packages/src/react/promise/promise.rs +++ b/crates/shirabe-external-packages/src/react/promise/promise.rs @@ -1,6 +1,6 @@ use shirabe_php_shim::PhpMixed; -use super::promise_interface::PromiseInterface; +use super::PromiseInterface; #[derive(Debug)] pub struct Promise; diff --git a/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs b/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs index dbff9a0..0c51d99 100644 --- a/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs +++ b/crates/shirabe-external-packages/src/seld/json_lint/json_parser.rs @@ -21,10 +21,7 @@ impl JsonParser { } /// PHP: JsonParser::lint() — returns null on success, ParsingException on failure. - pub fn lint( - &mut self, - _json: &str, - ) -> Option<crate::seld::json_lint::parsing_exception::ParsingException> { + pub fn lint(&mut self, _json: &str) -> Option<crate::seld::json_lint::ParsingException> { todo!() } } diff --git a/crates/shirabe-external-packages/src/seld/json_lint/mod.rs b/crates/shirabe-external-packages/src/seld/json_lint/mod.rs index fef5a26..1058268 100644 --- a/crates/shirabe-external-packages/src/seld/json_lint/mod.rs +++ b/crates/shirabe-external-packages/src/seld/json_lint/mod.rs @@ -1,3 +1,7 @@ pub mod duplicate_key_exception; pub mod json_parser; pub mod parsing_exception; + +pub use duplicate_key_exception::*; +pub use json_parser::*; +pub use parsing_exception::*; diff --git a/crates/shirabe-external-packages/src/seld/mod.rs b/crates/shirabe-external-packages/src/seld/mod.rs index c7b1cd4..ea1253b 100644 --- a/crates/shirabe-external-packages/src/seld/mod.rs +++ b/crates/shirabe-external-packages/src/seld/mod.rs @@ -1,3 +1,7 @@ pub mod json_lint; pub mod phar_utils; pub mod signal; + +pub use json_lint::*; +pub use phar_utils::*; +pub use signal::*; diff --git a/crates/shirabe-external-packages/src/seld/phar_utils/mod.rs b/crates/shirabe-external-packages/src/seld/phar_utils/mod.rs index 82049a8..fed35a8 100644 --- a/crates/shirabe-external-packages/src/seld/phar_utils/mod.rs +++ b/crates/shirabe-external-packages/src/seld/phar_utils/mod.rs @@ -1,2 +1,5 @@ pub mod linter; pub mod timestamps; + +pub use linter::*; +pub use timestamps::*; diff --git a/crates/shirabe-external-packages/src/seld/signal/mod.rs b/crates/shirabe-external-packages/src/seld/signal/mod.rs index 61f69bd..16f5151 100644 --- a/crates/shirabe-external-packages/src/seld/signal/mod.rs +++ b/crates/shirabe-external-packages/src/seld/signal/mod.rs @@ -1 +1,3 @@ pub mod signal_handler; + +pub use signal_handler::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/application.rs b/crates/shirabe-external-packages/src/symfony/component/console/application.rs index 1197792..65abce4 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/application.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/application.rs @@ -1,5 +1,5 @@ -use crate::symfony::component::console::input::input_interface::InputInterface; -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::input::InputInterface; +use crate::symfony::component::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs index 9fe7961..375170c 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/command/mod.rs @@ -1 +1,3 @@ pub mod command; + +pub use command::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs index 6300bb0..0d15845 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/completion/mod.rs @@ -1,2 +1,5 @@ pub mod completion_input; pub mod completion_suggestions; + +pub use completion_input::*; +pub use completion_suggestions::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs index febda79..25750a1 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/exception/mod.rs @@ -1,3 +1,7 @@ pub mod command_not_found_exception; pub mod exception_interface; pub mod invalid_argument_exception; + +pub use command_not_found_exception::*; +pub use exception_interface::*; +pub use invalid_argument_exception::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs index 81a2a87..540d3b3 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/formatter/mod.rs @@ -1,2 +1,5 @@ pub mod output_formatter; pub mod output_formatter_style; + +pub use output_formatter::*; +pub use output_formatter_style::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs index d1b9a1e..9c78e14 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/formatter/output_formatter.rs @@ -29,7 +29,7 @@ impl OutputFormatter { pub fn set_style( &mut self, _name: &str, - _style: crate::symfony::component::console::formatter::output_formatter_style::OutputFormatterStyle, + _style: crate::symfony::component::console::formatter::OutputFormatterStyle, ) { todo!() } diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs index 4fbb5c3..b31517a 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/mod.rs @@ -5,3 +5,11 @@ pub mod progress_bar; pub mod question_helper; pub mod table; pub mod table_separator; + +pub use formatter_helper::*; +pub use helper::*; +pub use helper_set::*; +pub use progress_bar::*; +pub use question_helper::*; +pub use table::*; +pub use table_separator::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs index b3aefef..1b896f9 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/progress_bar.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct ProgressBar; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs index 705cb9a..5c723c2 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/question_helper.rs @@ -1,6 +1,6 @@ -use crate::symfony::component::console::input::input_interface::InputInterface; -use crate::symfony::component::console::output::output_interface::OutputInterface; -use crate::symfony::component::console::question::question::Question; +use crate::symfony::component::console::input::InputInterface; +use crate::symfony::component::console::output::OutputInterface; +use crate::symfony::component::console::question::Question; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs index 0f7f336..ca8b292 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/helper/table.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs index 83f487b..86c982d 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/input/array_input.rs @@ -1,5 +1,5 @@ -use crate::symfony::component::console::input::input_definition::InputDefinition; -use crate::symfony::component::console::input::input_interface::InputInterface; +use crate::symfony::component::console::input::InputDefinition; +use crate::symfony::component::console::input::InputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs index 15a72c2..f38d524 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/input/input_interface.rs @@ -11,7 +11,7 @@ pub trait InputInterface { ) -> PhpMixed; fn bind( &mut self, - definition: &crate::symfony::component::console::input::input_definition::InputDefinition, + definition: &crate::symfony::component::console::input::InputDefinition, ) -> anyhow::Result<()>; fn validate(&self) -> anyhow::Result<()>; fn get_arguments(&self) -> indexmap::IndexMap<String, PhpMixed>; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs index 1a81599..2071388 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/input/mod.rs @@ -3,3 +3,9 @@ pub mod input_definition; pub mod input_interface; pub mod input_option; pub mod string_input; + +pub use array_input::*; +pub use input_definition::*; +pub use input_interface::*; +pub use input_option::*; +pub use string_input::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs index 5baaede..140082e 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/input/string_input.rs @@ -1,5 +1,5 @@ -use crate::symfony::component::console::input::input_definition::InputDefinition; -use crate::symfony::component::console::input::input_interface::InputInterface; +use crate::symfony::component::console::input::InputDefinition; +use crate::symfony::component::console::input::InputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/mod.rs index b7c65d8..ffb85d3 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/mod.rs @@ -9,3 +9,15 @@ pub mod output; pub mod question; pub mod single_command_application; pub mod terminal; + +pub use application::*; +pub use command::*; +pub use completion::*; +pub use exception::*; +pub use formatter::*; +pub use helper::*; +pub use input::*; +pub use output::*; +pub use question::*; +pub use single_command_application::*; +pub use terminal::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs index f9792f0..c834394 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output.rs @@ -1,5 +1,5 @@ -use crate::symfony::component::console::formatter::output_formatter::OutputFormatter; -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::formatter::OutputFormatter; +use crate::symfony::component::console::output::OutputInterface; #[derive(Debug)] pub struct ConsoleOutput; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs index 0e5fc88..8e68396 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/console_output_interface.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::output::OutputInterface; pub trait ConsoleOutputInterface: OutputInterface { fn get_error_output(&self) -> &dyn OutputInterface; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs index a548a0c..92a0789 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/mod.rs @@ -1,3 +1,7 @@ pub mod console_output; pub mod console_output_interface; pub mod output_interface; + +pub use console_output::*; +pub use console_output_interface::*; +pub use output_interface::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs index 22a4b17..36b6c08 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/output/output_interface.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::formatter::output_formatter::OutputFormatter; +use crate::symfony::component::console::formatter::OutputFormatter; pub trait OutputInterface { // PHP class semantics: OutputInterface methods take &self with interior mutability, diff --git a/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs b/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs index 0544ffd..67ffe4c 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/question/choice_question.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::question::question::Question; +use crate::symfony::component::console::question::Question; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs b/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs index e3a42e8..67e7e7b 100644 --- a/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/console/question/mod.rs @@ -1,2 +1,5 @@ pub mod choice_question; pub mod question; + +pub use choice_question::*; +pub use question::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs index e6d5ea1..2c19405 100644 --- a/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/filesystem/exception/mod.rs @@ -1 +1,3 @@ pub mod io_exception; + +pub use io_exception::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs b/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs index e74dc5f..24be2ed 100644 --- a/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/filesystem/mod.rs @@ -1,2 +1,5 @@ pub mod exception; pub mod filesystem; + +pub use exception::*; +pub use filesystem::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs b/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs index 466f17e..6622a9a 100644 --- a/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs +++ b/crates/shirabe-external-packages/src/symfony/component/finder/finder.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::finder::spl_file_info::SplFileInfo; +use crate::symfony::component::finder::SplFileInfo; /// Helper trait so `Finder::exclude` accepts both single strings and slices /// (PHP's variadic / array argument compatibility). diff --git a/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs b/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs index b71a0ef..4b2d4b8 100644 --- a/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/finder/mod.rs @@ -1,3 +1,7 @@ pub mod finder; pub mod glob; pub mod spl_file_info; + +pub use finder::*; +pub use glob::*; +pub use spl_file_info::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/mod.rs b/crates/shirabe-external-packages/src/symfony/component/mod.rs index e0d9e4f..f176d3a 100644 --- a/crates/shirabe-external-packages/src/symfony/component/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/mod.rs @@ -2,3 +2,8 @@ pub mod console; pub mod filesystem; pub mod finder; pub mod process; + +pub use console::*; +pub use filesystem::*; +pub use finder::*; +pub use process::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs index 0fec4ee..8d275c1 100644 --- a/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/process/exception/mod.rs @@ -1,3 +1,7 @@ pub mod process_signaled_exception; pub mod process_timed_out_exception; pub mod runtime_exception; + +pub use process_signaled_exception::*; +pub use process_timed_out_exception::*; +pub use runtime_exception::*; diff --git a/crates/shirabe-external-packages/src/symfony/component/process/mod.rs b/crates/shirabe-external-packages/src/symfony/component/process/mod.rs index 4d21bf3..6dd64e1 100644 --- a/crates/shirabe-external-packages/src/symfony/component/process/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/component/process/mod.rs @@ -2,3 +2,8 @@ pub mod exception; pub mod executable_finder; pub mod php_executable_finder; pub mod process; + +pub use exception::*; +pub use executable_finder::*; +pub use php_executable_finder::*; +pub use process::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/completion/mod.rs b/crates/shirabe-external-packages/src/symfony/console/completion/mod.rs index 67838b3..0d1c115 100644 --- a/crates/shirabe-external-packages/src/symfony/console/completion/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/completion/mod.rs @@ -1,3 +1,7 @@ pub mod completion_input; pub mod completion_suggestions; pub mod suggestion; + +pub use completion_input::*; +pub use completion_suggestions::*; +pub use suggestion::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs b/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs index 498f029..e76b8d9 100644 --- a/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/exception/mod.rs @@ -1 +1,3 @@ pub mod invalid_argument_exception; + +pub use invalid_argument_exception::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/mod.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/mod.rs index 8c6d8c8..0431601 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/mod.rs @@ -1,3 +1,7 @@ pub mod output_formatter; pub mod output_formatter_interface; pub mod output_formatter_style; + +pub use output_formatter::*; +pub use output_formatter_interface::*; +pub use output_formatter_style::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs index 01f8b61..8b921d6 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs @@ -25,7 +25,7 @@ impl OutputFormatter { pub fn set_style( &mut self, _name: &str, - _style: crate::symfony::console::formatter::output_formatter_style::OutputFormatterStyle, + _style: crate::symfony::console::formatter::OutputFormatterStyle, ) { todo!() } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs b/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs index 285c411..5908bd6 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/mod.rs @@ -1,3 +1,7 @@ pub mod helper_set; pub mod question_helper; pub mod table; + +pub use helper_set::*; +pub use question_helper::*; +pub use table::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs index aeb01d8..df4978c 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs @@ -1,4 +1,4 @@ -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs index 8feeeb8..0304649 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/array_input.rs @@ -1,4 +1,4 @@ -use crate::symfony::console::input::input_interface::InputInterface; +use crate::symfony::console::input::InputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-external-packages/src/symfony/console/input/mod.rs b/crates/shirabe-external-packages/src/symfony/console/input/mod.rs index fba76f2..77a6f66 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/mod.rs @@ -4,3 +4,10 @@ pub mod input_interface; pub mod input_option; pub mod streamable_input_interface; pub mod string_input; + +pub use array_input::*; +pub use input_argument::*; +pub use input_interface::*; +pub use input_option::*; +pub use streamable_input_interface::*; +pub use string_input::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs b/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs index ed4a238..aea2bf2 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/streamable_input_interface.rs @@ -1,4 +1,4 @@ -use crate::symfony::console::input::input_interface::InputInterface; +use crate::symfony::console::input::InputInterface; use shirabe_php_shim::PhpMixed; pub trait StreamableInputInterface: InputInterface { diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs index 6c3ebad..3d19823 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs @@ -1,4 +1,4 @@ -use crate::symfony::console::input::input_interface::InputInterface; +use crate::symfony::console::input::InputInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe-external-packages/src/symfony/console/mod.rs b/crates/shirabe-external-packages/src/symfony/console/mod.rs index ae105cd..6812ab6 100644 --- a/crates/shirabe-external-packages/src/symfony/console/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/mod.rs @@ -6,3 +6,12 @@ pub mod input; pub mod output; pub mod question; pub mod style; + +pub use completion::*; +pub use exception::*; +pub use formatter::*; +pub use helper::*; +pub use input::*; +pub use output::*; +pub use question::*; +pub use style::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/output/mod.rs b/crates/shirabe-external-packages/src/symfony/console/output/mod.rs index 80e9326..8f0c7f1 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/mod.rs @@ -1,2 +1,5 @@ pub mod output_interface; pub mod stream_output; + +pub use output_interface::*; +pub use stream_output::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs index 1f2a12d..4d5b7c7 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/output_interface.rs @@ -1,4 +1,4 @@ -use crate::symfony::console::formatter::output_formatter::OutputFormatter; +use crate::symfony::console::formatter::OutputFormatter; pub trait OutputInterface { fn write(&mut self, messages: &str, newline: bool, r#type: i64); diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs index fb7f607..654e7f6 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs @@ -1,5 +1,5 @@ -use crate::symfony::console::formatter::output_formatter::OutputFormatter; -use crate::symfony::console::output::output_interface::OutputInterface; +use crate::symfony::console::formatter::OutputFormatter; +use crate::symfony::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/console/question/mod.rs b/crates/shirabe-external-packages/src/symfony/console/question/mod.rs index b44264d..60c3107 100644 --- a/crates/shirabe-external-packages/src/symfony/console/question/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/question/mod.rs @@ -1 +1,3 @@ pub mod question; + +pub use question::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/style/mod.rs b/crates/shirabe-external-packages/src/symfony/console/style/mod.rs index e5c930f..e002b05 100644 --- a/crates/shirabe-external-packages/src/symfony/console/style/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/console/style/mod.rs @@ -1 +1,3 @@ pub mod symfony_style; + +pub use symfony_style::*; diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs index c3ab54e..92e9e67 100644 --- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs +++ b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs @@ -1,5 +1,5 @@ -use crate::symfony::component::console::input::input_interface::InputInterface; -use crate::symfony::component::console::output::output_interface::OutputInterface; +use crate::symfony::component::console::input::InputInterface; +use crate::symfony::component::console::output::OutputInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe-external-packages/src/symfony/mod.rs b/crates/shirabe-external-packages/src/symfony/mod.rs index 0abb8fc..aaafe15 100644 --- a/crates/shirabe-external-packages/src/symfony/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/mod.rs @@ -1,3 +1,7 @@ pub mod component; pub mod console; pub mod process; + +pub use component::*; +pub use console::*; +pub use process::*; diff --git a/crates/shirabe-external-packages/src/symfony/process/mod.rs b/crates/shirabe-external-packages/src/symfony/process/mod.rs index 0e705e3..aeca4ff 100644 --- a/crates/shirabe-external-packages/src/symfony/process/mod.rs +++ b/crates/shirabe-external-packages/src/symfony/process/mod.rs @@ -1 +1,3 @@ pub mod executable_finder; + +pub use executable_finder::*; diff --git a/crates/shirabe-semver/src/comparator.rs b/crates/shirabe-semver/src/comparator.rs index 575a656..6db06d4 100644 --- a/crates/shirabe-semver/src/comparator.rs +++ b/crates/shirabe-semver/src/comparator.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/composer/semver/src/Comparator.php -use crate::constraint::constraint::Constraint; +use crate::constraint::Constraint; pub struct Comparator; diff --git a/crates/shirabe-semver/src/compiling_matcher.rs b/crates/shirabe-semver/src/compiling_matcher.rs index f6a3689..737647f 100644 --- a/crates/shirabe-semver/src/compiling_matcher.rs +++ b/crates/shirabe-semver/src/compiling_matcher.rs @@ -5,8 +5,8 @@ use std::sync::OnceLock; use indexmap::IndexMap; -use crate::constraint::constraint::Constraint; -use crate::constraint::constraint_interface::ConstraintInterface; +use crate::constraint::Constraint; +use crate::constraint::ConstraintInterface; static COMPILED_CHECKER_CACHE: OnceLock< Mutex<IndexMap<String, Box<dyn Fn(String, bool) -> bool + Send + Sync>>>, diff --git a/crates/shirabe-semver/src/constraint.rs b/crates/shirabe-semver/src/constraint.rs index 8410b61..6a57a57 100644 --- a/crates/shirabe-semver/src/constraint.rs +++ b/crates/shirabe-semver/src/constraint.rs @@ -1,6 +1,13 @@ -pub mod bound; -pub mod constraint; -pub mod constraint_interface; -pub mod match_all_constraint; -pub mod match_none_constraint; -pub mod multi_constraint; +mod bound; +mod constraint; +mod constraint_interface; +mod match_all_constraint; +mod match_none_constraint; +mod multi_constraint; + +pub use bound::*; +pub use constraint::*; +pub use constraint_interface::*; +pub use match_all_constraint::*; +pub use match_none_constraint::*; +pub use multi_constraint::*; diff --git a/crates/shirabe-semver/src/constraint/constraint.rs b/crates/shirabe-semver/src/constraint/constraint.rs index 4ac4cda..3ac633d 100644 --- a/crates/shirabe-semver/src/constraint/constraint.rs +++ b/crates/shirabe-semver/src/constraint/constraint.rs @@ -5,8 +5,8 @@ use std::sync::Mutex; use anyhow::bail; use shirabe_php_shim as php; -use crate::constraint::bound::Bound; -use crate::constraint::constraint_interface::ConstraintInterface; +use crate::constraint::Bound; +use crate::constraint::ConstraintInterface; #[derive(Debug)] pub struct Constraint { @@ -403,7 +403,7 @@ impl ConstraintInterface for Constraint { impl std::fmt::Display for Constraint { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - use crate::constraint::constraint_interface::ConstraintInterface; + use crate::constraint::ConstraintInterface; write!(f, "{}", ConstraintInterface::__to_string(self)) } } diff --git a/crates/shirabe-semver/src/constraint/constraint_interface.rs b/crates/shirabe-semver/src/constraint/constraint_interface.rs index f4bd905..f04ed2a 100644 --- a/crates/shirabe-semver/src/constraint/constraint_interface.rs +++ b/crates/shirabe-semver/src/constraint/constraint_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/vendor/composer/semver/src/Constraint/ConstraintInterface.php -use crate::constraint::bound::Bound; +use crate::constraint::Bound; pub trait ConstraintInterface: std::fmt::Debug { fn matches(&self, provider: &dyn ConstraintInterface) -> bool; diff --git a/crates/shirabe-semver/src/constraint/match_all_constraint.rs b/crates/shirabe-semver/src/constraint/match_all_constraint.rs index 41aa32d..b695ce2 100644 --- a/crates/shirabe-semver/src/constraint/match_all_constraint.rs +++ b/crates/shirabe-semver/src/constraint/match_all_constraint.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/semver/src/Constraint/MatchAllConstraint.php -use crate::constraint::bound::Bound; -use crate::constraint::constraint_interface::ConstraintInterface; +use crate::constraint::Bound; +use crate::constraint::ConstraintInterface; #[derive(Debug)] pub struct MatchAllConstraint { diff --git a/crates/shirabe-semver/src/constraint/match_none_constraint.rs b/crates/shirabe-semver/src/constraint/match_none_constraint.rs index 51e13fd..587058a 100644 --- a/crates/shirabe-semver/src/constraint/match_none_constraint.rs +++ b/crates/shirabe-semver/src/constraint/match_none_constraint.rs @@ -1,7 +1,7 @@ //! ref: composer/vendor/composer/semver/src/Constraint/MatchNoneConstraint.php -use crate::constraint::bound::Bound; -use crate::constraint::constraint_interface::ConstraintInterface; +use crate::constraint::Bound; +use crate::constraint::ConstraintInterface; #[derive(Debug)] pub struct MatchNoneConstraint { diff --git a/crates/shirabe-semver/src/constraint/multi_constraint.rs b/crates/shirabe-semver/src/constraint/multi_constraint.rs index 15397b6..4222095 100644 --- a/crates/shirabe-semver/src/constraint/multi_constraint.rs +++ b/crates/shirabe-semver/src/constraint/multi_constraint.rs @@ -2,9 +2,9 @@ use std::cell::RefCell; -use crate::constraint::bound::Bound; -use crate::constraint::constraint_interface::ConstraintInterface; -use crate::constraint::match_all_constraint::MatchAllConstraint; +use crate::constraint::Bound; +use crate::constraint::ConstraintInterface; +use crate::constraint::MatchAllConstraint; pub struct MultiConstraint { pub(crate) constraints: Vec<Box<dyn ConstraintInterface>>, diff --git a/crates/shirabe-semver/src/interval.rs b/crates/shirabe-semver/src/interval.rs index 237ad0b..b1f3010 100644 --- a/crates/shirabe-semver/src/interval.rs +++ b/crates/shirabe-semver/src/interval.rs @@ -2,7 +2,7 @@ use std::sync::OnceLock; -use crate::constraint::constraint::Constraint; +use crate::constraint::Constraint; #[derive(Debug, Clone)] pub struct DevConstraintSet { diff --git a/crates/shirabe-semver/src/intervals.rs b/crates/shirabe-semver/src/intervals.rs index 384cb4e..72231b6 100644 --- a/crates/shirabe-semver/src/intervals.rs +++ b/crates/shirabe-semver/src/intervals.rs @@ -3,11 +3,11 @@ use std::collections::HashMap; use std::sync::{Mutex, OnceLock}; -use crate::constraint::constraint::Constraint; -use crate::constraint::constraint_interface::ConstraintInterface; -use crate::constraint::match_all_constraint::MatchAllConstraint; -use crate::constraint::match_none_constraint::MatchNoneConstraint; -use crate::constraint::multi_constraint::MultiConstraint; +use crate::constraint::Constraint; +use crate::constraint::ConstraintInterface; +use crate::constraint::MatchAllConstraint; +use crate::constraint::MatchNoneConstraint; +use crate::constraint::MultiConstraint; use crate::interval::{DevConstraintSet, Interval}; use shirabe_php_shim as php; diff --git a/crates/shirabe-semver/src/semver.rs b/crates/shirabe-semver/src/semver.rs index 28e74a6..62f50b6 100644 --- a/crates/shirabe-semver/src/semver.rs +++ b/crates/shirabe-semver/src/semver.rs @@ -3,7 +3,7 @@ use std::sync::OnceLock; use crate::comparator::Comparator; -use crate::constraint::constraint::Constraint; +use crate::constraint::Constraint; use crate::version_parser::VersionParser; pub struct Semver; diff --git a/crates/shirabe-semver/src/version_parser.rs b/crates/shirabe-semver/src/version_parser.rs index 39000e7..ba2b59d 100644 --- a/crates/shirabe-semver/src/version_parser.rs +++ b/crates/shirabe-semver/src/version_parser.rs @@ -1,9 +1,9 @@ //! ref: composer/vendor/composer/semver/src/VersionParser.php -use crate::constraint::constraint::Constraint; -use crate::constraint::constraint_interface::ConstraintInterface; -use crate::constraint::match_all_constraint::MatchAllConstraint; -use crate::constraint::multi_constraint::MultiConstraint; +use crate::constraint::Constraint; +use crate::constraint::ConstraintInterface; +use crate::constraint::MatchAllConstraint; +use crate::constraint::MultiConstraint; use shirabe_php_shim as php; // Regex to match pre-release data (sort of). diff --git a/crates/shirabe/src/advisory/audit_config.rs b/crates/shirabe/src/advisory/audit_config.rs index bdf3e8d..1feff3f 100644 --- a/crates/shirabe/src/advisory/audit_config.rs +++ b/crates/shirabe/src/advisory/audit_config.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use shirabe_php_shim::{InvalidArgumentException, PhpMixed}; -use crate::advisory::auditor::Auditor; +use crate::advisory::Auditor; use crate::config::Config; #[derive(Debug, Clone)] diff --git a/crates/shirabe/src/advisory/auditor.rs b/crates/shirabe/src/advisory/auditor.rs index 8a2f624..5418fac 100644 --- a/crates/shirabe/src/advisory/auditor.rs +++ b/crates/shirabe/src/advisory/auditor.rs @@ -3,24 +3,25 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::{ DATE_ATOM, InvalidArgumentException, PhpMixed, array_all, array_any, array_key_exists, array_keys, array_reduce, get_class, is_string, sprintf, str_starts_with, }; -use crate::advisory::ignored_security_advisory::IgnoredSecurityAdvisory; -use crate::advisory::security_advisory::SecurityAdvisory; -use crate::io::console_io::ConsoleIO; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::advisory_provider_interface::PartialOrSecurityAdvisory; -use crate::repository::repository_set::RepositorySet; -use crate::util::package_info::PackageInfo; +use crate::advisory::IgnoredSecurityAdvisory; +use crate::advisory::SecurityAdvisory; +use crate::io::ConsoleIO; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::base_package; +use crate::package::base_package::BasePackage; +use crate::repository::PartialOrSecurityAdvisory; +use crate::repository::RepositorySet; +use crate::util::PackageInfo; /// @internal #[derive(Debug)] diff --git a/crates/shirabe/src/advisory/ignored_security_advisory.rs b/crates/shirabe/src/advisory/ignored_security_advisory.rs index 03e7d78..1cd5f75 100644 --- a/crates/shirabe/src/advisory/ignored_security_advisory.rs +++ b/crates/shirabe/src/advisory/ignored_security_advisory.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Advisory/IgnoredSecurityAdvisory.php -use crate::advisory::security_advisory::SecurityAdvisory; +use crate::advisory::SecurityAdvisory; use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug, serde::Serialize)] #[serde(rename_all = "camelCase")] diff --git a/crates/shirabe/src/advisory/mod.rs b/crates/shirabe/src/advisory/mod.rs index 783e9b7..bcfbe93 100644 --- a/crates/shirabe/src/advisory/mod.rs +++ b/crates/shirabe/src/advisory/mod.rs @@ -3,3 +3,9 @@ pub mod auditor; pub mod ignored_security_advisory; pub mod partial_security_advisory; pub mod security_advisory; + +pub use audit_config::*; +pub use auditor::*; +pub use ignored_security_advisory::*; +pub use partial_security_advisory::*; +pub use security_advisory::*; diff --git a/crates/shirabe/src/advisory/partial_security_advisory.rs b/crates/shirabe/src/advisory/partial_security_advisory.rs index a47ec02..6953ef3 100644 --- a/crates/shirabe/src/advisory/partial_security_advisory.rs +++ b/crates/shirabe/src/advisory/partial_security_advisory.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/Advisory/PartialSecurityAdvisory.php -use crate::advisory::security_advisory::SecurityAdvisory; -use crate::repository::advisory_provider_interface::PartialOrSecurityAdvisory; +use crate::advisory::SecurityAdvisory; +use crate::repository::PartialOrSecurityAdvisory; use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{PhpMixed, UnexpectedValueException}; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::version_parser::VersionParser; fn serialize_constraint<S: serde::Serializer>( diff --git a/crates/shirabe/src/advisory/security_advisory.rs b/crates/shirabe/src/advisory/security_advisory.rs index bf10c2a..9787d37 100644 --- a/crates/shirabe/src/advisory/security_advisory.rs +++ b/crates/shirabe/src/advisory/security_advisory.rs @@ -2,10 +2,10 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::advisory::ignored_security_advisory::IgnoredSecurityAdvisory; -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; +use crate::advisory::IgnoredSecurityAdvisory; +use crate::advisory::PartialSecurityAdvisory; #[derive(Debug, serde::Serialize)] #[serde(rename_all = "camelCase")] diff --git a/crates/shirabe/src/autoload/autoload_generator.rs b/crates/shirabe/src/autoload/autoload_generator.rs index 3477226..7b7980a 100644 --- a/crates/shirabe/src/autoload/autoload_generator.rs +++ b/crates/shirabe/src/autoload/autoload_generator.rs @@ -4,8 +4,8 @@ use indexmap::IndexMap; use shirabe_class_map_generator::class_map::ClassMap; use shirabe_class_map_generator::class_map_generator::ClassMapGenerator; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter; use shirabe_php_shim::{ E_USER_DEPRECATED, InvalidArgumentException, PhpMixed, RuntimeException, array_filter, array_keys, array_map, array_merge, array_merge_recursive, array_reverse, array_shift, @@ -14,28 +14,28 @@ use shirabe_php_shim::{ sprintf, str_contains, str_replace, str_starts_with, strlen, strpos, strtr, substr, substr_count, trigger_error, trim, unlink, var_export, }; -use shirabe_semver::constraint::bound::Bound; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::Bound; +use shirabe_semver::constraint::ConstraintInterface; -use crate::autoload::class_loader::ClassLoader; +use crate::autoload::ClassLoader; use crate::config::Config; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -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::installer::installation_manager::InstallationManager; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; -use crate::package::locker::Locker; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::script::script_events::ScriptEvents; -use crate::util::filesystem::Filesystem; -use crate::util::package_sorter::PackageSorter; -use crate::util::platform::Platform; +use crate::event_dispatcher::EventDispatcher; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::installer::InstallationManager; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::Locker; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::InstalledRepositoryInterface; +use crate::script::ScriptEvents; +use crate::util::Filesystem; +use crate::util::PackageSorter; +use crate::util::Platform; #[derive(Debug)] pub struct AutoloadGenerator { @@ -1092,7 +1092,7 @@ impl AutoloadGenerator { let mut required_extensions: IndexMap<String, String> = IndexMap::new(); let mut extension_providers: IndexMap< String, - Vec<Box<dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface>>, + Vec<Box<dyn shirabe_semver::constraint::ConstraintInterface>>, > = IndexMap::new(); for item in package_map { diff --git a/crates/shirabe/src/autoload/class_map_generator.rs b/crates/shirabe/src/autoload/class_map_generator.rs index e5a2ec5..da086ad 100644 --- a/crates/shirabe/src/autoload/class_map_generator.rs +++ b/crates/shirabe/src/autoload/class_map_generator.rs @@ -5,7 +5,7 @@ use indexmap::IndexMap; use shirabe_class_map_generator::class_map_generator::ClassMapGenerator as ExternalClassMapGenerator; use shirabe_php_shim::PhpMixed; -use crate::io::io_interface::IOInterface; +use crate::io::IOInterface; #[derive(Debug)] pub struct ClassMapGenerator; diff --git a/crates/shirabe/src/autoload/mod.rs b/crates/shirabe/src/autoload/mod.rs index e460f71..cb0be1c 100644 --- a/crates/shirabe/src/autoload/mod.rs +++ b/crates/shirabe/src/autoload/mod.rs @@ -1,3 +1,7 @@ pub mod autoload_generator; pub mod class_loader; pub mod class_map_generator; + +pub use autoload_generator::*; +pub use class_loader::*; +pub use class_map_generator::*; diff --git a/crates/shirabe/src/cache.rs b/crates/shirabe/src/cache.rs index 848ee80..c4fd181 100644 --- a/crates/shirabe/src/cache.rs +++ b/crates/shirabe/src/cache.rs @@ -4,17 +4,17 @@ use std::sync::Mutex; use anyhow::Result; use chrono::Utc; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ abs, bin2hex, dirname, file_exists, file_get_contents, file_put_contents, filemtime, hash_file, is_dir, is_writable, mkdir, random_bytes, random_int, rename, time, unlink, }; -use crate::io::io_interface::IOInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::silencer::Silencer; +use crate::io::IOInterface; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::Silencer; /// Reads/writes to a filesystem cache #[derive(Debug)] 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<dyn crate::repository::repository_interface::RepositoryInterface>, - > = vec![local_repo.clone_box()]; + let mut repos: Vec<Box<dyn crate::repository::RepositoryInterface>> = + 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<dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface>, - > = match version.as_deref() { - Some(v) => Some(parser.parse_constraints(v)?.clone_box()), - None => None, - }; + let constraint: Option<Box<dyn shirabe_semver::constraint::ConstraintInterface>> = + 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 shirabe_semver::constraint::Bound; +use shirabe_semver::constraint::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 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( "<warning>No dependencies installed. Try running composer install or update, or use --locked.</warning>", - 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<dyn crate::repository::repository_interface::RepositoryInterface> = - 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<dyn crate::repository::RepositoryInterface> = 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( "<error>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.</error>", 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<String, Vec<Link>> = IndexMap::new(); let mut remove_packages: Vec<String> = 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<dyn crate::repository::RepositoryInterface> = if input + .get_option("lock") + .as_bool() + .unwrap_or(false) + { io.write_error(&format!( "<info>Checking {}platform requirements using the lock file</info>", 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<dyn crate::repository::repository_interface::RepositoryInterface> + as Box<dyn crate::repository::RepositoryInterface> } 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<dyn crate::repository::repository_interface::RepositoryInterface>, + Box<dyn crate::repository::RepositoryInterface>, > = 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<crate::package::link::Link> = vec![]; + let links: Vec<crate::package::Link> = 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, - <dyn crate::package::package_interface::PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV + <dyn crate::package::PackageInterface>::DISPLAY_SOURCE_REF_IF_DEV ) )); @@ -967,7 +967,7 @@ impl CreateProjectCommand { &self, config: &Config, input: &dyn InputInterface, - ) -> Result<crate::advisory::audit_config::AuditConfig> { + ) -> Result<crate::advisory::AuditConfig> { 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 = <PlatformRepository as crate::repository::repository_interface::RepositoryInterface>::find_package( + let php_pkg = <PlatformRepository as crate::repository::RepositoryInterface>::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<dyn crate::repository::RepositoryInterface> = + 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::<AliasPackage>().is_none() { // TODO: check for CompleteAliasPackage as well if let Some(complete_pkg) = package.as_any().downcast_ref::<CompletePackage>() { 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<String, crate::repository::repository_set::RepositorySet> { + ) -> &mut IndexMap<String, crate::repository::RepositorySet> { todo!() } @@ -71,7 +71,8 @@ impl PackageDiscoveryTrait for InitCommand { fn get_platform_requirement_filter( &self, input: &dyn InputInterface, - ) -> Box<dyn crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface>{ + ) -> Box<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface> + { 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<dyn crate::repository::repository_interface::RepositoryInterface>, - > = vec![Box::new(PlatformRepository::new(vec![], IndexMap::new())?)]; + let mut repos: Vec<Box<dyn crate::repository::RepositoryInterface>> = + 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)?; - <crate::repository::lock_array_repository::LockArrayRepository as crate::repository::repository_interface::RepositoryInterface>::get_packages(&repo) + <crate::repository::LockArrayRepository as crate::repository::RepositoryInterface>::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<Box<dyn crate::package::package_interface::PackageInterface>> = packages + let pkg_pi: Vec<Box<dyn crate::package::PackageInterface>> = 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<dyn crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface>; + ) -> Box<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface>; fn normalize_requirements(&self, requires: Vec<String>) -> Vec<IndexMap<String, String>>; 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<dyn crate::repository::repository_interface::RepositoryInterface>, - > = vec![ + let mut repos: Vec<Box<dyn crate::repository::RepositoryInterface>> = 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<String, crate::repository::ProviderInfo> = + 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<dyn crate::package::package_interface::PackageInterface>, - > = vec![]; + let mut packages_to_reinstall: Vec<Box<dyn crate::package::PackageInterface>> = vec![]; let mut package_names_to_reinstall: Vec<String> = 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<dyn crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface>{ + ) -> Box<dyn crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface> + { 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<dyn crate::repository::repository_interface::RepositoryInterface>, - > = vec![ + let mut combined: Vec<Box<dyn crate::repository::RepositoryInterface>> = 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<String, IndexMap<String, crate::package::link::Link>> = + let mut links: IndexMap<String, IndexMap<String, crate::package::Link>> = 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<Box<dyn BasePackage>> requires conversion - let root_pkg_as_base: Box<dyn crate::package::base_package::BasePackage> = + let root_pkg_as_base: Box<dyn crate::package::BasePackage> = todo!("convert RootPackageInterface to Box<dyn BasePackage>"); 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<Box<dyn PackageInterface>> while RepositoryInterface::get_packages // returns Vec<Box<dyn BasePackage>>. Use only the locker branch for now. - let installed_packages: Vec<Box<dyn crate::package::package_interface::PackageInterface>> = + let installed_packages: Vec<Box<dyn crate::package::PackageInterface>> = 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 { diff --git a/crates/shirabe/src/compiler.rs b/crates/shirabe/src/compiler.rs index 713aa59..bad682b 100644 --- a/crates/shirabe/src/compiler.rs +++ b/crates/shirabe/src/compiler.rs @@ -1,21 +1,21 @@ //! ref: composer/src/Composer/Compiler.php use indexmap::IndexMap; -use shirabe_external_packages::composer::ca_bundle::ca_bundle::CaBundle; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::seld::phar_utils::linter::Linter; -use shirabe_external_packages::seld::phar_utils::timestamps::Timestamps; -use shirabe_external_packages::symfony::component::finder::finder::Finder; -use shirabe_external_packages::symfony::component::finder::spl_file_info::SplFileInfo; +use shirabe_external_packages::composer::ca_bundle::CaBundle; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::seld::phar_utils::Linter; +use shirabe_external_packages::seld::phar_utils::Timestamps; +use shirabe_external_packages::symfony::component::finder::Finder; +use shirabe_external_packages::symfony::component::finder::SplFileInfo; use shirabe_php_shim::{ Phar, PhpMixed, RuntimeException, T_COMMENT, T_DOC_COMMENT, T_WHITESPACE, UnexpectedValueException, array_search, file_exists, file_get_contents, strcmp, strtr, strtr_array, token_get_all, }; -use crate::json::json_file::JsonFile; -use crate::util::git::Git; -use crate::util::process_executor::ProcessExecutor; +use crate::json::JsonFile; +use crate::util::Git; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct Compiler { diff --git a/crates/shirabe/src/composer.rs b/crates/shirabe/src/composer.rs index 69f272e..1dfe5c8 100644 --- a/crates/shirabe/src/composer.rs +++ b/crates/shirabe/src/composer.rs @@ -1,13 +1,13 @@ //! ref: composer/src/Composer/Composer.php -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; -use crate::autoload::autoload_generator::AutoloadGenerator; -use crate::downloader::download_manager::DownloadManager; -use crate::package::archiver::archive_manager::ArchiveManager; -use crate::package::locker::Locker; +use crate::autoload::AutoloadGenerator; +use crate::downloader::DownloadManager; +use crate::package::Locker; +use crate::package::archiver::ArchiveManager; use crate::partial_composer::PartialComposer; -use crate::plugin::plugin_manager::PluginManager; +use crate::plugin::PluginManager; #[derive(Debug)] pub struct Composer { @@ -109,7 +109,7 @@ impl Composer { self.autoload_generator.as_mut().unwrap() } - pub fn get_package(&self) -> &dyn crate::package::root_package_interface::RootPackageInterface { + pub fn get_package(&self) -> &dyn crate::package::RootPackageInterface { self.inner.get_package() } @@ -123,37 +123,28 @@ impl Composer { self.inner.get_config_mut() } - pub fn get_repository_manager( - &self, - ) -> &crate::repository::repository_manager::RepositoryManager { + pub fn get_repository_manager(&self) -> &crate::repository::RepositoryManager { self.inner.get_repository_manager() } pub fn set_event_dispatcher( &mut self, - dispatcher: std::rc::Rc< - std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>, - >, + dispatcher: std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::EventDispatcher>>, ) { self.inner.set_event_dispatcher(dispatcher); } pub fn get_event_dispatcher( &self, - ) -> &std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>> - { + ) -> &std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::EventDispatcher>> { self.inner.get_event_dispatcher() } - pub fn get_installation_manager( - &self, - ) -> &crate::installer::installation_manager::InstallationManager { + pub fn get_installation_manager(&self) -> &crate::installer::InstallationManager { self.inner.get_installation_manager() } - pub fn get_installation_manager_mut( - &mut self, - ) -> &mut crate::installer::installation_manager::InstallationManager { + pub fn get_installation_manager_mut(&mut self) -> &mut crate::installer::InstallationManager { self.inner.get_installation_manager_mut() } @@ -173,17 +164,11 @@ impl Composer { self.inner.set_global(); } - pub fn set_repository_manager( - &mut self, - manager: crate::repository::repository_manager::RepositoryManager, - ) { + pub fn set_repository_manager(&mut self, manager: crate::repository::RepositoryManager) { self.inner.set_repository_manager(manager); } - pub fn set_installation_manager( - &mut self, - manager: crate::installer::installation_manager::InstallationManager, - ) { + pub fn set_installation_manager(&mut self, manager: crate::installer::InstallationManager) { self.inner.set_installation_manager(manager); } @@ -195,10 +180,7 @@ impl Composer { &self.inner } - pub fn set_package( - &mut self, - package: Box<dyn crate::package::root_package_interface::RootPackageInterface>, - ) { + pub fn set_package(&mut self, package: Box<dyn crate::package::RootPackageInterface>) { self.inner.set_package(package); } } diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index 5516020..f39fc1c 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -1,12 +1,15 @@ //! ref: composer/src/Composer/Config.php -pub mod config_source_interface; -pub mod json_config_source; +mod config_source_interface; +mod json_config_source; + +pub use config_source_interface::*; +pub use json_config_source::*; 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::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ E_USER_DEPRECATED, FILTER_VALIDATE_URL, PHP_URL_HOST, PHP_URL_SCHEME, PhpMixed, RuntimeException, array_key_exists, array_merge_recursive, array_reverse, array_search_mixed, @@ -15,12 +18,11 @@ use shirabe_php_shim::{ }; use std::cell::RefCell; -use crate::advisory::auditor::Auditor; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::advisory::Auditor; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct Config { diff --git a/crates/shirabe/src/config/json_config_source.rs b/crates/shirabe/src/config/json_config_source.rs index b6c3722..7b5fc03 100644 --- a/crates/shirabe/src/config/json_config_source.rs +++ b/crates/shirabe/src/config/json_config_source.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Config/JsonConfigSource.php -use crate::util::silencer::Silencer; +use crate::util::Silencer; use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::{ @@ -8,11 +8,11 @@ use shirabe_php_shim::{ file_get_contents, file_put_contents, implode, is_writable, sprintf, }; -use crate::config::config_source_interface::ConfigSourceInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_manipulator::JsonManipulator; -use crate::json::json_validation_exception::JsonValidationException; -use crate::util::filesystem::Filesystem; +use crate::config::ConfigSourceInterface; +use crate::json::JsonFile; +use crate::json::JsonManipulator; +use crate::json::JsonValidationException; +use crate::util::Filesystem; /// JSON Configuration Source #[derive(Debug)] diff --git a/crates/shirabe/src/console/application.rs b/crates/shirabe/src/console/application.rs index 23094eb..9239bc6 100644 --- a/crates/shirabe/src/console/application.rs +++ b/crates/shirabe/src/console/application.rs @@ -3,86 +3,85 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::xdebug_handler::xdebug_handler::XdebugHandler; -use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; -use shirabe_external_packages::symfony::component::console::application::Application as BaseApplication; -use shirabe_external_packages::symfony::component::console::command::command::Command; -use shirabe_external_packages::symfony::component::console::exception::command_not_found_exception::CommandNotFoundException; -use shirabe_external_packages::symfony::component::console::exception::exception_interface::ExceptionInterface; -use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet; -use shirabe_external_packages::symfony::component::console::helper::question_helper::QuestionHelper; -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::input::input_option::InputOption; -use shirabe_external_packages::symfony::component::console::output::console_output_interface::ConsoleOutputInterface; +use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; +use shirabe_external_packages::seld::json_lint::ParsingException; +use shirabe_external_packages::symfony::component::console::Application as BaseApplication; +use shirabe_external_packages::symfony::component::console::SingleCommandApplication; +use shirabe_external_packages::symfony::component::console::command::Command; +use shirabe_external_packages::symfony::component::console::exception::CommandNotFoundException; +use shirabe_external_packages::symfony::component::console::exception::ExceptionInterface; +use shirabe_external_packages::symfony::component::console::helper::HelperSet; +use shirabe_external_packages::symfony::component::console::helper::QuestionHelper; +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::input::InputOption; +use shirabe_external_packages::symfony::component::console::output::ConsoleOutputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::{ self as output_interface, OutputInterface, }; -use shirabe_external_packages::symfony::component::console::single_command_application::SingleCommandApplication; -use shirabe_external_packages::symfony::component::process::exception::process_timed_out_exception::ProcessTimedOutException; +use shirabe_external_packages::symfony::component::process::exception::ProcessTimedOutException; use shirabe_php_shim::{ - array_merge, bin2hex, chdir, clone, count, date_default_timezone_get, - date_default_timezone_set, defined, dirname, disk_free_space, error_get_last, - extension_loaded, file_exists, file_get_contents, file_put_contents, function_exists, get_class, - getcwd, getmypid, glob, ini_set, in_array, is_array, is_dir, is_file, is_string, - is_subclass_of, json_decode, max_i64, memory_get_peak_usage, memory_get_usage, microtime, - method_exists, php_uname, posix_getuid, random_bytes, realpath, register_shutdown_function, - restore_error_handler, round, sprintf, str_contains, str_replace, strpos, strtoupper, - sys_get_temp_dir, time, unlink, PhpMixed, RuntimeException, UnexpectedValueException, - LogicException as ShimLogicException, - PHP_BINARY, PHP_VERSION, PHP_VERSION_ID, + LogicException as ShimLogicException, PHP_BINARY, PHP_VERSION, PHP_VERSION_ID, PhpMixed, + RuntimeException, UnexpectedValueException, array_merge, bin2hex, chdir, clone, count, + date_default_timezone_get, date_default_timezone_set, defined, dirname, disk_free_space, + error_get_last, extension_loaded, file_exists, file_get_contents, file_put_contents, + function_exists, get_class, getcwd, getmypid, glob, in_array, ini_set, is_array, is_dir, + is_file, is_string, is_subclass_of, json_decode, max_i64, memory_get_peak_usage, + memory_get_usage, method_exists, microtime, php_uname, posix_getuid, random_bytes, realpath, + register_shutdown_function, restore_error_handler, round, sprintf, str_contains, str_replace, + strpos, strtoupper, sys_get_temp_dir, time, unlink, }; -use crate::command::about_command::AboutCommand; -use crate::command::archive_command::ArchiveCommand; -use crate::command::audit_command::AuditCommand; -use crate::command::base_command::BaseCommand; -use crate::command::bump_command::BumpCommand; -use crate::command::check_platform_reqs_command::CheckPlatformReqsCommand; -use crate::command::clear_cache_command::ClearCacheCommand; -use crate::command::config_command::ConfigCommand; -use crate::command::create_project_command::CreateProjectCommand; -use crate::command::depends_command::DependsCommand; -use crate::command::diagnose_command::DiagnoseCommand; -use crate::command::dump_autoload_command::DumpAutoloadCommand; -use crate::command::exec_command::ExecCommand; -use crate::command::fund_command::FundCommand; -use crate::command::global_command::GlobalCommand; -use crate::command::home_command::HomeCommand; -use crate::command::init_command::InitCommand; -use crate::command::install_command::InstallCommand; -use crate::command::licenses_command::LicensesCommand; -use crate::command::outdated_command::OutdatedCommand; -use crate::command::prohibits_command::ProhibitsCommand; -use crate::command::reinstall_command::ReinstallCommand; -use crate::command::remove_command::RemoveCommand; -use crate::command::repository_command::RepositoryCommand; -use crate::command::require_command::RequireCommand; -use crate::command::run_script_command::RunScriptCommand; -use crate::command::script_alias_command::ScriptAliasCommand; -use crate::command::search_command::SearchCommand; -use crate::command::self_update_command::SelfUpdateCommand; -use crate::command::show_command::ShowCommand; -use crate::command::status_command::StatusCommand; -use crate::command::suggests_command::SuggestsCommand; -use crate::command::update_command::UpdateCommand; -use crate::command::validate_command::ValidateCommand; +use crate::command::AboutCommand; +use crate::command::ArchiveCommand; +use crate::command::AuditCommand; +use crate::command::BaseCommand; +use crate::command::BumpCommand; +use crate::command::CheckPlatformReqsCommand; +use crate::command::ClearCacheCommand; +use crate::command::ConfigCommand; +use crate::command::CreateProjectCommand; +use crate::command::DependsCommand; +use crate::command::DiagnoseCommand; +use crate::command::DumpAutoloadCommand; +use crate::command::ExecCommand; +use crate::command::FundCommand; +use crate::command::GlobalCommand; +use crate::command::HomeCommand; +use crate::command::InitCommand; +use crate::command::InstallCommand; +use crate::command::LicensesCommand; +use crate::command::OutdatedCommand; +use crate::command::ProhibitsCommand; +use crate::command::ReinstallCommand; +use crate::command::RemoveCommand; +use crate::command::RepositoryCommand; +use crate::command::RequireCommand; +use crate::command::RunScriptCommand; +use crate::command::ScriptAliasCommand; +use crate::command::SearchCommand; +use crate::command::SelfUpdateCommand; +use crate::command::ShowCommand; +use crate::command::StatusCommand; +use crate::command::SuggestsCommand; +use crate::command::UpdateCommand; +use crate::command::ValidateCommand; use crate::composer::Composer; -use crate::console::github_action_error::GithubActionError; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::script_execution_exception::ScriptExecutionException; -use crate::exception::no_ssl_exception::NoSslException; +use crate::console::GithubActionError; +use crate::downloader::TransportException; +use crate::event_dispatcher::ScriptExecutionException; +use crate::exception::NoSslException; use crate::factory::Factory; use crate::installer::Installer; -use crate::io::console_io::ConsoleIO; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::json::json_validation_exception::JsonValidationException; -use crate::util::error_handler::ErrorHandler; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::silencer::Silencer; +use crate::io::ConsoleIO; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::json::JsonValidationException; +use crate::util::ErrorHandler; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::Silencer; #[derive(Debug)] pub struct Application { @@ -636,9 +635,11 @@ impl Application { // TODO(phase-b): build_package_map needs &mut InstallationManager // but get_composer returns &Composer; skip until shared ownership is settled. let package_map: Vec<( - Box<dyn crate::package::package_interface::PackageInterface>, + Box<dyn crate::package::PackageInterface>, Option<String>, - )> = todo!("build_package_map requires &mut InstallationManager"); + )> = todo!( + "build_package_map requires &mut InstallationManager" + ); let map = generator.parse_autoloads( package_map, &*root_package, diff --git a/crates/shirabe/src/console/github_action_error.rs b/crates/shirabe/src/console/github_action_error.rs index c74f95f..933ba0a 100644 --- a/crates/shirabe/src/console/github_action_error.rs +++ b/crates/shirabe/src/console/github_action_error.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Console/GithubActionError.php -use crate::io::io_interface::IOInterface; -use crate::util::platform::Platform; +use crate::io::IOInterface; +use crate::util::Platform; #[derive(Debug)] pub struct GithubActionError { diff --git a/crates/shirabe/src/console/html_output_formatter.rs b/crates/shirabe/src/console/html_output_formatter.rs index a0099e5..39294c8 100644 --- a/crates/shirabe/src/console/html_output_formatter.rs +++ b/crates/shirabe/src/console/html_output_formatter.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Console/HtmlOutputFormatter.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -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::symfony::console::formatter::OutputFormatter; +use shirabe_external_packages::symfony::console::formatter::OutputFormatterStyle; #[derive(Debug)] pub struct HtmlOutputFormatter { diff --git a/crates/shirabe/src/console/input/input_argument.rs b/crates/shirabe/src/console/input/input_argument.rs index c2c2799..458ec61 100644 --- a/crates/shirabe/src/console/input/input_argument.rs +++ b/crates/shirabe/src/console/input/input_argument.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Console/Input/InputArgument.php use anyhow::Result; -use shirabe_external_packages::symfony::console::input::input_argument::InputArgument as BaseInputArgument; +use shirabe_external_packages::symfony::console::input::InputArgument as BaseInputArgument; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs index 0c0745e..92c4a51 100644 --- a/crates/shirabe/src/console/input/input_option.rs +++ b/crates/shirabe/src/console/input/input_option.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Console/Input/InputOption.php use anyhow::Result; -use shirabe_external_packages::symfony::console::input::input_option::InputOption as BaseInputOption; +use shirabe_external_packages::symfony::console::input::InputOption as BaseInputOption; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe/src/console/input/mod.rs b/crates/shirabe/src/console/input/mod.rs index 54f33a8..093d2f4 100644 --- a/crates/shirabe/src/console/input/mod.rs +++ b/crates/shirabe/src/console/input/mod.rs @@ -1,6 +1,9 @@ pub mod input_argument; pub mod input_option; +pub use input_argument::*; +pub use input_option::*; + pub enum InputDefinitionItem { Argument(input_argument::InputArgument), Option(input_option::InputOption), diff --git a/crates/shirabe/src/console/mod.rs b/crates/shirabe/src/console/mod.rs index ea42d75..9289d7e 100644 --- a/crates/shirabe/src/console/mod.rs +++ b/crates/shirabe/src/console/mod.rs @@ -2,3 +2,8 @@ pub mod application; pub mod github_action_error; pub mod html_output_formatter; pub mod input; + +pub use application::*; +pub use github_action_error::*; +pub use html_output_formatter::*; +pub use input::*; diff --git a/crates/shirabe/src/dependency_resolver/decisions.rs b/crates/shirabe/src/dependency_resolver/decisions.rs index f3f8f5a..1fdc1d3 100644 --- a/crates/shirabe/src/dependency_resolver/decisions.rs +++ b/crates/shirabe/src/dependency_resolver/decisions.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/DependencyResolver/Decisions.php -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::rule::Rule; -use crate::dependency_resolver::solver_bug_exception::SolverBugException; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Rule; +use crate::dependency_resolver::SolverBugException; use indexmap::IndexMap; use shirabe_php_shim::LogicException; use std::fmt; diff --git a/crates/shirabe/src/dependency_resolver/default_policy.rs b/crates/shirabe/src/dependency_resolver/default_policy.rs index 5d37855..c24e382 100644 --- a/crates/shirabe/src/dependency_resolver/default_policy.rs +++ b/crates/shirabe/src/dependency_resolver/default_policy.rs @@ -5,14 +5,14 @@ use std::cell::RefCell; use indexmap::IndexMap; use shirabe_semver::compiling_matcher::CompilingMatcher; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::dependency_resolver::pool::Pool; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::{BasePackage, STABILITIES}; -use crate::package::package_interface::PackageInterface; -use crate::util::platform::Platform; +use crate::dependency_resolver::PolicyInterface; +use crate::dependency_resolver::Pool; +use crate::package::AliasPackage; +use crate::package::PackageInterface; +use crate::package::{BasePackage, STABILITIES}; +use crate::util::Platform; #[derive(Debug)] pub struct DefaultPolicy { diff --git a/crates/shirabe/src/dependency_resolver/generic_rule.rs b/crates/shirabe/src/dependency_resolver/generic_rule.rs index c0381ef..11cff06 100644 --- a/crates/shirabe/src/dependency_resolver/generic_rule.rs +++ b/crates/shirabe/src/dependency_resolver/generic_rule.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/DependencyResolver/GenericRule.php -use crate::dependency_resolver::rule::{Rule, RuleBase}; +use crate::dependency_resolver::{Rule, RuleBase}; use anyhow::Result; use shirabe_php_shim::{PHP_VERSION_ID, PhpMixed, RuntimeException, hash_raw, implode, unpack}; diff --git a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs index 4dd27b1..b4aa4a4 100644 --- a/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/local_repo_transaction.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/DependencyResolver/LocalRepoTransaction.php -use super::transaction::Transaction; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::repository_interface::RepositoryInterface; +use super::Transaction; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct LocalRepoTransaction { @@ -25,8 +25,7 @@ impl LocalRepoTransaction { pub fn get_operations( &self, - ) -> Vec<Box<dyn crate::dependency_resolver::operation::operation_interface::OperationInterface>> - { + ) -> Vec<Box<dyn crate::dependency_resolver::operation::OperationInterface>> { // TODO(phase-b): delegate to inner transaction once operations are typed. Vec::new() } diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs index ef49bd8..14900d1 100644 --- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs +++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs @@ -3,14 +3,14 @@ use std::any::Any; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; -use crate::dependency_resolver::decisions::Decisions; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::transaction::Transaction; -use crate::package::alias_package::AliasPackage; -use crate::package::package::Package; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::Decisions; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Transaction; +use crate::package::AliasPackage; +use crate::package::Package; +use crate::package::PackageInterface; #[derive(Debug)] pub struct LockTransaction { @@ -226,8 +226,7 @@ impl LockTransaction { pub fn get_operations( &self, - ) -> &Vec<Box<dyn crate::dependency_resolver::operation::operation_interface::OperationInterface>> - { + ) -> &Vec<Box<dyn crate::dependency_resolver::operation::OperationInterface>> { self.inner.get_operations() } } diff --git a/crates/shirabe/src/dependency_resolver/mod.rs b/crates/shirabe/src/dependency_resolver/mod.rs index 9154084..bcde18b 100644 --- a/crates/shirabe/src/dependency_resolver/mod.rs +++ b/crates/shirabe/src/dependency_resolver/mod.rs @@ -24,3 +24,30 @@ pub mod solver; pub mod solver_bug_exception; pub mod solver_problems_exception; pub mod transaction; + +pub use decisions::*; +pub use default_policy::*; +pub use generic_rule::*; +pub use local_repo_transaction::*; +pub use lock_transaction::*; +pub use multi_conflict_rule::*; +pub use operation::*; +pub use policy_interface::*; +pub use pool::*; +pub use pool_builder::*; +pub use pool_optimizer::*; +pub use problem::*; +pub use request::*; +pub use rule::*; +pub use rule_set::*; +pub use rule_set_generator::*; +pub use rule_set_iterator::*; +pub use rule_watch_chain::*; +pub use rule_watch_graph::*; +pub use rule_watch_node::*; +pub use rule2_literals::*; +pub use security_advisory_pool_filter::*; +pub use solver::*; +pub use solver_bug_exception::*; +pub use solver_problems_exception::*; +pub use transaction::*; diff --git a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs index e2b781c..6447be0 100644 --- a/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs +++ b/crates/shirabe/src/dependency_resolver/multi_conflict_rule.rs @@ -2,9 +2,9 @@ use shirabe_php_shim::PhpMixed; -use crate::dependency_resolver::generic_rule::RuleLiterals; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::rule::{ReasonData, Rule, RuleBase}; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::RuleLiterals; +use crate::dependency_resolver::{ReasonData, Rule, RuleBase}; use anyhow::Result; use shirabe_php_shim::{PHP_VERSION_ID, RuntimeException, hash_raw}; diff --git a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs index 53b5f99..ee5e84d 100644 --- a/crates/shirabe/src/dependency_resolver/operation/install_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/install_operation.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/InstallOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::solver_operation::SolverOperation; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::SolverOperation; +use crate::package::PackageInterface; #[derive(Debug)] pub struct InstallOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs index fa6f13d..e176b7f 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_installed_operation.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/MarkAliasInstalledOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::solver_operation::SolverOperation; -use crate::package::alias_package::AliasPackage; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::SolverOperation; +use crate::package::AliasPackage; +use crate::package::PackageInterface; #[derive(Debug)] pub struct MarkAliasInstalledOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs index b9d5d26..141bf4a 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mark_alias_uninstalled_operation.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/MarkAliasUninstalledOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::solver_operation::SolverOperation; -use crate::package::alias_package::AliasPackage; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::SolverOperation; +use crate::package::AliasPackage; +use crate::package::PackageInterface; #[derive(Debug)] pub struct MarkAliasUninstalledOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/mod.rs b/crates/shirabe/src/dependency_resolver/operation/mod.rs index ffb0ac7..720c5a0 100644 --- a/crates/shirabe/src/dependency_resolver/operation/mod.rs +++ b/crates/shirabe/src/dependency_resolver/operation/mod.rs @@ -5,3 +5,11 @@ pub mod operation_interface; pub mod solver_operation; pub mod uninstall_operation; pub mod update_operation; + +pub use install_operation::*; +pub use mark_alias_installed_operation::*; +pub use mark_alias_uninstalled_operation::*; +pub use operation_interface::*; +pub use solver_operation::*; +pub use uninstall_operation::*; +pub use update_operation::*; diff --git a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs index 5eb955a..a5b5e5f 100644 --- a/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs +++ b/crates/shirabe/src/dependency_resolver/operation/operation_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/OperationInterface.php -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; pub trait OperationInterface: std::fmt::Debug { fn as_any(&self) -> &dyn std::any::Any; @@ -31,7 +31,7 @@ pub trait OperationInterface: std::fmt::Debug { /// PHP duck-typed accessor. Only InstallOperation/UninstallOperation/MarkAlias*Operation /// expose this; UpdateOperation has getInitialPackage()/getTargetPackage() instead. - fn get_package(&self) -> &dyn crate::package::package_interface::PackageInterface { + fn get_package(&self) -> &dyn crate::package::PackageInterface { todo!("get_package is not available on this operation type") } } diff --git a/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs b/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs index 96e4667..2710ec5 100644 --- a/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/solver_operation.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/SolverOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; +use crate::dependency_resolver::operation::OperationInterface; pub trait SolverOperation: OperationInterface { const TYPE: &'static str; diff --git a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs index be7f6f1..5e1f6bc 100644 --- a/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/uninstall_operation.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/UninstallOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::solver_operation::SolverOperation; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::SolverOperation; +use crate::package::PackageInterface; #[derive(Debug)] pub struct UninstallOperation { diff --git a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs index 9adb248..2ce103b 100644 --- a/crates/shirabe/src/dependency_resolver/operation/update_operation.rs +++ b/crates/shirabe/src/dependency_resolver/operation/update_operation.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/DependencyResolver/Operation/UpdateOperation.php -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::solver_operation::SolverOperation; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::SolverOperation; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; #[derive(Debug)] pub struct UpdateOperation { diff --git a/crates/shirabe/src/dependency_resolver/policy_interface.rs b/crates/shirabe/src/dependency_resolver/policy_interface.rs index 606386f..148e21f 100644 --- a/crates/shirabe/src/dependency_resolver/policy_interface.rs +++ b/crates/shirabe/src/dependency_resolver/policy_interface.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/DependencyResolver/PolicyInterface.php -use crate::dependency_resolver::pool::Pool; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::Pool; +use crate::package::PackageInterface; pub trait PolicyInterface: std::fmt::Debug { fn version_compare( diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs index 9b52ba7..e43eb53 100644 --- a/crates/shirabe/src/dependency_resolver/pool.rs +++ b/crates/shirabe/src/dependency_resolver/pool.rs @@ -5,12 +5,12 @@ use std::fmt; use indexmap::IndexMap; use shirabe_php_shim::{Countable, STR_PAD_LEFT, abs, spl_object_hash, str_pad}; use shirabe_semver::compiling_matcher::CompilingMatcher; -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::advisory::partial_security_advisory::PartialSecurityAdvisory; -use crate::package::base_package::BasePackage; -use crate::package::version::version_parser::VersionParser; +use crate::advisory::PartialSecurityAdvisory; +use crate::package::BasePackage; +use crate::package::version::VersionParser; /// A package pool contains all packages for dependency resolution #[derive(Debug)] diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs index a790dfc..fcc0339 100644 --- a/crates/shirabe/src/dependency_resolver/pool_builder.rs +++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs @@ -3,37 +3,37 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::semver::compiling_matcher::CompilingMatcher; -use shirabe_external_packages::composer::semver::intervals::Intervals; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::semver::CompilingMatcher; +use shirabe_external_packages::composer::semver::Intervals; use shirabe_php_shim::{ LogicException, PhpMixed, array_chunk, array_flip, array_flip_strings, array_map, array_merge, array_search, array_search_mixed, count, in_array, microtime, number_format, round, spl_object_hash, sprintf, strpos, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; +use shirabe_semver::constraint::MultiConstraint; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::pool_optimizer::PoolOptimizer; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::security_advisory_pool_filter::SecurityAdvisoryPoolFilter; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::PoolOptimizer; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::SecurityAdvisoryPoolFilter; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackage; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::package_interface::PackageInterface; -use crate::package::version::stability_filter::StabilityFilter; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::pre_pool_create_event::PrePoolCreateEvent; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::root_package_repository::RootPackageRepository; +use crate::package::version::StabilityFilter; +use crate::plugin::PluginEvents; +use crate::plugin::PrePoolCreateEvent; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RootPackageRepository; #[derive(Debug)] pub struct PoolBuilder { @@ -560,7 +560,7 @@ impl PoolBuilder { } } let packages_in_result = result.packages; - for package in &packages_in_result { + for (_, package) in &packages_in_result { // TODO(phase-b): proper upcast Box<dyn BasePackage> → Box<dyn PackageInterface>; // clone_box on BasePackage produces a BasePackage, while loaded_per_repo stores PackageInterface. let pkg_name = package.get_name().to_string(); diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs index 3869078..326587a 100644 --- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs +++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs @@ -6,18 +6,18 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::{LogicException, PhpMixed, implode, ksort, spl_object_hash}; use shirabe_semver::compiling_matcher::CompilingMatcher; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::intervals::Intervals; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::request::Request; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; +use crate::dependency_resolver::PolicyInterface; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Request; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; /// Optimizes a given pool #[derive(Debug)] @@ -379,7 +379,7 @@ impl PoolOptimizer { fn calculate_dependency_hash(&self, package: &dyn BasePackage) -> String { let mut hash = String::new(); - let hash_relevant_links: Vec<(&str, Vec<crate::package::link::Link>)> = vec![ + let hash_relevant_links: Vec<(&str, Vec<crate::package::Link>)> = vec![ ( "requires", package.get_requires().values().cloned().collect(), diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index c73dd3e..4bc5fe8 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -2,31 +2,31 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::console::formatter::OutputFormatter; use shirabe_php_shim::{ LogicException, PhpMixed, defined, extension_loaded, implode, in_array, php_to_string, phpversion, spl_object_hash, sprintf, str_replace, str_starts_with, stripos, strpos, strtolower, substr, substr_count, version_compare, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MultiConstraint; -use crate::advisory::security_advisory::SecurityAdvisory; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::request::Request; +use crate::advisory::SecurityAdvisory; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Request; use crate::dependency_resolver::rule::{self, Rule}; -use crate::package::alias_package::AliasPackage; -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::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_set::RepositorySet; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::package::version::VersionParser; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositorySet; /// Represents a problem detected while solving dependencies #[derive(Debug)] @@ -1211,9 +1211,7 @@ impl Problem { constraint: Option<&dyn ConstraintInterface>, ) -> (String, String) { let mut next_repo_packages: Vec<Box<dyn BasePackage>> = Vec::new(); - let mut next_repo: Option< - Box<dyn crate::repository::repository_interface::RepositoryInterface>, - > = None; + let mut next_repo: Option<Box<dyn crate::repository::RepositoryInterface>> = None; for package in all_repos_packages { // TODO(phase-b): RepositoryInterface has no equals(); reference identity needed. @@ -1401,16 +1399,16 @@ impl Problem { let providers = repository_set.get_providers(package_name); if providers.len() > 0 { let provider_count = providers.len() as i64; - let slice: Vec<crate::repository::repository_interface::ProviderInfo> = - if provider_count > max_providers + 1 { - providers - .values() - .take(max_providers as usize) - .cloned() - .collect::<Vec<_>>() - } else { - providers.values().cloned().collect::<Vec<_>>() - }; + let slice: Vec<crate::repository::ProviderInfo> = if provider_count > max_providers + 1 + { + providers + .values() + .take(max_providers as usize) + .cloned() + .collect::<Vec<_>>() + } else { + providers.values().cloned().collect::<Vec<_>>() + }; let mut providers_str = implode( "", &slice diff --git a/crates/shirabe/src/dependency_resolver/request.rs b/crates/shirabe/src/dependency_resolver/request.rs index 7930d70..d181bd2 100644 --- a/crates/shirabe/src/dependency_resolver/request.rs +++ b/crates/shirabe/src/dependency_resolver/request.rs @@ -2,14 +2,14 @@ use indexmap::IndexMap; use shirabe_php_shim::{LogicException, spl_object_hash, strtolower}; -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::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::LockArrayRepository; +use crate::repository::RepositoryInterface; /// Identifies a partial update for listed packages only, all dependencies will remain at locked versions pub const UPDATE_ONLY_LISTED: i64 = 0; diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs index 37bf30a..bf117ad 100644 --- a/crates/shirabe/src/dependency_resolver/rule.rs +++ b/crates/shirabe/src/dependency_resolver/rule.rs @@ -8,20 +8,20 @@ use shirabe_php_shim::{ LogicException, PhpMixed, abs, array_filter, array_keys, array_shift, array_values, implode, is_object, }; -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::dependency_resolver::pool::Pool; -use crate::dependency_resolver::problem::Problem; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::rule_set::RuleSet; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_set::RepositorySet; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Problem; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::RuleSet; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::repository::PlatformRepository; +use crate::repository::RepositorySet; /// PHP: @phpstan-type ReasonData = Link|BasePackage|string|int|array{...}|array{...} /// We model this as an enum. @@ -89,9 +89,7 @@ pub trait Rule: std::fmt::Display + std::fmt::Debug { /// PHP: `$rule instanceof MultiConflictRule`. Returns a borrow of the /// underlying `MultiConflictRule` when this rule is one, otherwise `None`. - fn as_multi_conflict( - &self, - ) -> Option<&crate::dependency_resolver::multi_conflict_rule::MultiConflictRule> { + fn as_multi_conflict(&self) -> Option<&crate::dependency_resolver::MultiConflictRule> { None } diff --git a/crates/shirabe/src/dependency_resolver/rule2_literals.rs b/crates/shirabe/src/dependency_resolver/rule2_literals.rs index 1c98200..3642f8a 100644 --- a/crates/shirabe/src/dependency_resolver/rule2_literals.rs +++ b/crates/shirabe/src/dependency_resolver/rule2_literals.rs @@ -2,9 +2,9 @@ use shirabe_php_shim::PhpMixed; -use crate::dependency_resolver::generic_rule::RuleLiterals; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::rule::{ReasonData, Rule, RuleBase}; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::RuleLiterals; +use crate::dependency_resolver::{ReasonData, Rule, RuleBase}; #[derive(Debug)] pub struct Rule2Literals { diff --git a/crates/shirabe/src/dependency_resolver/rule_set.rs b/crates/shirabe/src/dependency_resolver/rule_set.rs index 0e3d1de..fa49bec 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set.rs @@ -3,11 +3,11 @@ use indexmap::IndexMap; use shirabe_php_shim::OutOfBoundsException; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::rule::Rule; -use crate::dependency_resolver::rule_set_iterator::RuleSetIterator; -use crate::repository::repository_set::RepositorySet; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::Rule; +use crate::dependency_resolver::RuleSetIterator; +use crate::repository::RepositorySet; #[derive(Debug)] pub struct RuleSet { diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 91533b3..57d1d18 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -6,20 +6,20 @@ use std::collections::VecDeque; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::dependency_resolver::generic_rule::GenericRule; -use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::request::Request; +use crate::dependency_resolver::GenericRule; +use crate::dependency_resolver::MultiConflictRule; +use crate::dependency_resolver::PolicyInterface; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::Rule2Literals; +use crate::dependency_resolver::RuleSet; use crate::dependency_resolver::rule::{self, Rule}; -use crate::dependency_resolver::rule_set::RuleSet; -use crate::dependency_resolver::rule2_literals::Rule2Literals; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::PackageInterface; #[derive(Debug)] pub struct RuleSetGenerator { diff --git a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs index 259b510..73c406f 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/DependencyResolver/RuleSetIterator.php -use crate::dependency_resolver::rule::Rule; +use crate::dependency_resolver::Rule; use indexmap::IndexMap; /// Implements PHP \Iterator over a grouped rule set. diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs b/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs index 3355b29..aa2d7f7 100644 --- a/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs +++ b/crates/shirabe/src/dependency_resolver/rule_watch_chain.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/DependencyResolver/RuleWatchChain.php -use crate::dependency_resolver::rule_watch_node::RuleWatchNode; +use crate::dependency_resolver::RuleWatchNode; /// An extension of SplDoublyLinkedList with seek and removal of current element. #[derive(Debug)] diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs b/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs index a8176ee..639061d 100644 --- a/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs +++ b/crates/shirabe/src/dependency_resolver/rule_watch_graph.rs @@ -4,11 +4,11 @@ use std::any::Any; use indexmap::IndexMap; -use crate::dependency_resolver::decisions::Decisions; -use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule; -use crate::dependency_resolver::rule::Rule; -use crate::dependency_resolver::rule_watch_chain::RuleWatchChain; -use crate::dependency_resolver::rule_watch_node::RuleWatchNode; +use crate::dependency_resolver::Decisions; +use crate::dependency_resolver::MultiConflictRule; +use crate::dependency_resolver::Rule; +use crate::dependency_resolver::RuleWatchChain; +use crate::dependency_resolver::RuleWatchNode; #[derive(Debug)] pub struct RuleWatchGraph { diff --git a/crates/shirabe/src/dependency_resolver/rule_watch_node.rs b/crates/shirabe/src/dependency_resolver/rule_watch_node.rs index 6c1bada..a643d3e 100644 --- a/crates/shirabe/src/dependency_resolver/rule_watch_node.rs +++ b/crates/shirabe/src/dependency_resolver/rule_watch_node.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/DependencyResolver/RuleWatchNode.php -use crate::dependency_resolver::decisions::Decisions; -use crate::dependency_resolver::generic_rule::RuleLiterals; +use crate::dependency_resolver::Decisions; +use crate::dependency_resolver::RuleLiterals; pub struct RuleWatchNode { pub watch1: i64, @@ -59,7 +59,7 @@ impl RuleWatchNode { /// Owned clone for callers that need a `Box<dyn Rule>`. Default impl in /// `RuleLiterals` returns `todo!()`; concrete rule impls override it. - pub fn get_rule_boxed(&self) -> Box<dyn crate::dependency_resolver::rule::Rule> { + pub fn get_rule_boxed(&self) -> Box<dyn crate::dependency_resolver::Rule> { self.rule.clone_rule_box() } diff --git a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs index 82c9dec..742a709 100644 --- a/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs +++ b/crates/shirabe/src/dependency_resolver/security_advisory_pool_filter.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/DependencyResolver/SecurityAdvisoryPoolFilter.php -use crate::advisory::audit_config::AuditConfig; -use crate::advisory::auditor::Auditor; -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::request::Request; -use crate::package::package_interface::PackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::advisory::AuditConfig; +use crate::advisory::Auditor; +use crate::advisory::PartialSecurityAdvisory; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Request; +use crate::package::PackageInterface; +use crate::repository::RepositoryInterface; use indexmap::IndexMap; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; #[derive(Debug)] pub struct SecurityAdvisoryPoolFilter { diff --git a/crates/shirabe/src/dependency_resolver/solver.rs b/crates/shirabe/src/dependency_resolver/solver.rs index 4421013..f9721f8 100644 --- a/crates/shirabe/src/dependency_resolver/solver.rs +++ b/crates/shirabe/src/dependency_resolver/solver.rs @@ -5,28 +5,28 @@ use indexmap::IndexMap; use shirabe_php_shim::{ PhpMixed, array_pop, array_shift, array_unshift, microtime, spl_object_hash, sprintf, }; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::dependency_resolver::decisions::Decisions; -use crate::dependency_resolver::generic_rule::GenericRule; -use crate::dependency_resolver::lock_transaction::LockTransaction; -use crate::dependency_resolver::multi_conflict_rule::MultiConflictRule; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::problem::Problem; -use crate::dependency_resolver::request::Request; +use crate::dependency_resolver::Decisions; +use crate::dependency_resolver::GenericRule; +use crate::dependency_resolver::LockTransaction; +use crate::dependency_resolver::MultiConflictRule; +use crate::dependency_resolver::PolicyInterface; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Problem; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::RuleSet; +use crate::dependency_resolver::RuleSetGenerator; +use crate::dependency_resolver::RuleWatchGraph; +use crate::dependency_resolver::RuleWatchNode; +use crate::dependency_resolver::SolverBugException; +use crate::dependency_resolver::SolverProblemsException; use crate::dependency_resolver::rule::{self, Rule}; -use crate::dependency_resolver::rule_set::RuleSet; -use crate::dependency_resolver::rule_set_generator::RuleSetGenerator; -use crate::dependency_resolver::rule_watch_graph::RuleWatchGraph; -use crate::dependency_resolver::rule_watch_node::RuleWatchNode; -use crate::dependency_resolver::solver_bug_exception::SolverBugException; -use crate::dependency_resolver::solver_problems_exception::SolverProblemsException; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -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::package::base_package::BasePackage; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::package::BasePackage; #[derive(Debug)] pub struct Solver { @@ -251,7 +251,7 @@ impl Solver { self.setup_fixed_map(request); self.io - .write_error3("Generating rules", true, crate::io::io_interface::DEBUG); + .write_error3("Generating rules", true, crate::io::DEBUG); // TODO(phase-b): Pool is a PHP class without Clone; RuleSetGenerator should hold // a shared reference (Rc<RefCell<Pool>>). Using a placeholder pool until then. let mut rule_set_generator = RuleSetGenerator::new( @@ -276,22 +276,18 @@ impl Solver { // make decisions based on root require/fix assertions self.make_assertion_rule_decisions()?; - self.io.write_error3( - "Resolving dependencies through SAT", - true, - crate::io::io_interface::DEBUG, - ); + self.io + .write_error3("Resolving dependencies through SAT", true, crate::io::DEBUG); let before = microtime(true); self.run_sat()?; - self.io - .write_error3("", true, crate::io::io_interface::DEBUG); + self.io.write_error3("", true, crate::io::DEBUG); self.io.write_error3( &sprintf( "Dependency resolution completed in %.3f seconds", &[PhpMixed::Float(microtime(true) - before)], ), true, - crate::io::io_interface::VERBOSE, + crate::io::VERBOSE, ); if self.problems.len() > 0 { @@ -796,11 +792,8 @@ impl Solver { let mut rules_count = self.rules.count(); let mut pass = 1_i64; - self.io.write_error3( - "Looking at all rules.", - true, - crate::io::io_interface::DEBUG, - ); + self.io + .write_error3("Looking at all rules.", true, crate::io::DEBUG); let mut i = 0_i64; let mut n = 0_i64; while n < rules_count { @@ -812,7 +805,7 @@ impl Solver { pass ), false, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } else { self.io.overwrite_error4( @@ -822,7 +815,7 @@ impl Solver { ), false, None, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } diff --git a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs index f05dd87..8c9e488 100644 --- a/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs +++ b/crates/shirabe/src/dependency_resolver/solver_problems_exception.rs @@ -2,12 +2,12 @@ use shirabe_php_shim::RuntimeException; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::problem::Problem; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::rule::Rule; -use crate::repository::repository_set::RepositorySet; -use crate::util::ini_helper::IniHelper; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::Problem; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::Rule; +use crate::repository::RepositorySet; +use crate::util::IniHelper; #[derive(Debug)] pub struct SolverProblemsException { @@ -70,7 +70,7 @@ impl SolverProblemsException { .unwrap_or_default() )); // TODO(phase-b): get_reasons returns an IndexMap; flatten its values into Vec<Vec<...>>. - let reasons_vec: Vec<Vec<Box<dyn crate::dependency_resolver::rule::Rule>>> = problem + let reasons_vec: Vec<Vec<Box<dyn crate::dependency_resolver::Rule>>> = problem .get_reasons() .values() .map(|v| v.iter().map(|r| r.clone_box()).collect()) diff --git a/crates/shirabe/src/dependency_resolver/transaction.rs b/crates/shirabe/src/dependency_resolver/transaction.rs index 8c4595f..a704c67 100644 --- a/crates/shirabe/src/dependency_resolver/transaction.rs +++ b/crates/shirabe/src/dependency_resolver/transaction.rs @@ -8,16 +8,16 @@ use shirabe_php_shim::{ strcmp, uasort, }; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::mark_alias_installed_operation::MarkAliasInstalledOperation; -use crate::dependency_resolver::operation::mark_alias_uninstalled_operation::MarkAliasUninstalledOperation; -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::package::alias_package::AliasPackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::repository::platform_repository::PlatformRepository; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::MarkAliasInstalledOperation; +use crate::dependency_resolver::operation::MarkAliasUninstalledOperation; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::package::AliasPackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::repository::PlatformRepository; /// @internal #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/archive_downloader.rs b/crates/shirabe/src/downloader/archive_downloader.rs index 45121ee..3346275 100644 --- a/crates/shirabe/src/downloader/archive_downloader.rs +++ b/crates/shirabe/src/downloader/archive_downloader.rs @@ -2,17 +2,17 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, RuntimeException, bin2hex, file_exists, is_dir, random_bytes, realpath, }; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::package::package_interface::PackageInterface; -use crate::util::platform::Platform; +use crate::dependency_resolver::operation::InstallOperation; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::package::PackageInterface; +use crate::util::Platform; pub trait ArchiveDownloader { fn inner(&self) -> &FileDownloader; diff --git a/crates/shirabe/src/downloader/change_report_interface.rs b/crates/shirabe/src/downloader/change_report_interface.rs index 2148689..f5e686a 100644 --- a/crates/shirabe/src/downloader/change_report_interface.rs +++ b/crates/shirabe/src/downloader/change_report_interface.rs @@ -2,7 +2,7 @@ use anyhow::Result; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait ChangeReportInterface { fn get_local_changes( diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs index 630f16d..e81a6bb 100644 --- a/crates/shirabe/src/downloader/download_manager.rs +++ b/crates/shirabe/src/downloader/download_manager.rs @@ -3,19 +3,19 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, RuntimeException, array_keys, array_reverse, array_shift, dirname, get_class, implode, in_array, preg_quote, rtrim, sprintf, str_replace, strtolower, usort, }; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; +use crate::downloader::DownloaderInterface; +use crate::exception::IrrecoverableDownloadException; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; /// Downloaders manager. #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/downloader_interface.rs b/crates/shirabe/src/downloader/downloader_interface.rs index 11ec928..9ced979 100644 --- a/crates/shirabe/src/downloader/downloader_interface.rs +++ b/crates/shirabe/src/downloader/downloader_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Downloader/DownloaderInterface.php -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait DownloaderInterface: std::fmt::Debug { fn get_installation_source(&self) -> String; @@ -81,25 +81,21 @@ pub trait DownloaderInterface: std::fmt::Debug { ) -> anyhow::Result<Box<dyn PromiseInterface>>; /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. - fn as_change_report_interface( - &self, - ) -> Option<&dyn crate::downloader::change_report_interface::ChangeReportInterface> { + fn as_change_report_interface(&self) -> Option<&dyn crate::downloader::ChangeReportInterface> { None } /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. fn as_vcs_capable_downloader_interface( &self, - ) -> Option< - &dyn crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface, - > { + ) -> Option<&dyn crate::downloader::VcsCapableDownloaderInterface> { None } /// TODO(phase-b): runtime downcast helpers for PHP `instanceof` checks. fn as_dvcs_downloader_interface( &self, - ) -> Option<&dyn crate::downloader::dvcs_downloader_interface::DvcsDownloaderInterface> { + ) -> Option<&dyn crate::downloader::DvcsDownloaderInterface> { None } } diff --git a/crates/shirabe/src/downloader/dvcs_downloader_interface.rs b/crates/shirabe/src/downloader/dvcs_downloader_interface.rs index df82629..94c3e4f 100644 --- a/crates/shirabe/src/downloader/dvcs_downloader_interface.rs +++ b/crates/shirabe/src/downloader/dvcs_downloader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/DvcsDownloaderInterface.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait DvcsDownloaderInterface { fn get_unpushed_changes(&self, package: &dyn PackageInterface, path: String) -> Option<String>; diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs index 48160e6..4d33370 100644 --- a/crates/shirabe/src/downloader/file_downloader.rs +++ b/crates/shirabe/src/downloader/file_downloader.rs @@ -5,8 +5,8 @@ use anyhow::Result; use indexmap::IndexMap; use std::sync::{LazyLock, Mutex}; -use crate::util::silencer::Silencer; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::util::Silencer; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_external_packages::react::promise::resolve as react_promise_resolve; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, InvalidArgumentException, PATHINFO_BASENAME, PATHINFO_EXTENSION, @@ -17,27 +17,27 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::downloader::change_report_interface::ChangeReportInterface; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::max_file_size_exceeded_exception::MaxFileSizeExceededException; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::comparer::comparer::Comparer; -use crate::package::package_interface::PackageInterface; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::post_file_download_event::PostFileDownloadEvent; -use crate::plugin::pre_file_download_event::PreFileDownloadEvent; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url as UrlUtil; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::ChangeReportInterface; +use crate::downloader::DownloaderInterface; +use crate::downloader::MaxFileSizeExceededException; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::exception::IrrecoverableDownloadException; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::PackageInterface; +use crate::package::comparer::Comparer; +use crate::plugin::PluginEvents; +use crate::plugin::PostFileDownloadEvent; +use crate::plugin::PreFileDownloadEvent; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url as UrlUtil; /// @var array<string, int|string> /// @private diff --git a/crates/shirabe/src/downloader/fossil_downloader.rs b/crates/shirabe/src/downloader/fossil_downloader.rs index 8842a3a..363fd50 100644 --- a/crates/shirabe/src/downloader/fossil_downloader.rs +++ b/crates/shirabe/src/downloader/fossil_downloader.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Downloader/FossilDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::RuntimeException; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index 519f48a..668a5e9 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -3,9 +3,9 @@ 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::pcre::{CaptureKey, Preg}; use shirabe_external_packages::react::promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ PhpMixed, RuntimeException, array_map, basename, dirname, implode, in_array, is_dir, preg_quote, realpath, rtrim, sprintf, strlen, strpos, substr, trim, version_compare, @@ -13,15 +13,15 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::dvcs_downloader_interface::DvcsDownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::git::Git as GitUtil; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::downloader::DvcsDownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::Git as GitUtil; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url; #[derive(Debug)] pub struct GitDownloader { @@ -1360,7 +1360,7 @@ impl DvcsDownloaderInterface for GitDownloader { // TODO(phase-b): GitDownloader extends VcsDownloader which implements DownloaderInterface. // Delegating each trait method to todo!() until the inner VcsDownloaderBase exposes the // matching impl surface. -impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloader { +impl crate::downloader::DownloaderInterface for GitDownloader { fn get_installation_source(&self) -> String { todo!() } @@ -1371,9 +1371,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _path: &str, _prev_package: Option<&dyn PackageInterface>, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1383,9 +1381,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _prev_package: Option<&dyn PackageInterface>, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1394,9 +1390,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1405,9 +1399,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _initial: &dyn PackageInterface, _target: &dyn PackageInterface, _path: &str, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1416,9 +1408,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _output: bool, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } @@ -1428,9 +1418,7 @@ impl crate::downloader::downloader_interface::DownloaderInterface for GitDownloa _package: &dyn PackageInterface, _path: &str, _prev_package: Option<&dyn PackageInterface>, - ) -> anyhow::Result< - Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>, - > { + ) -> anyhow::Result<Box<dyn shirabe_external_packages::react::promise::PromiseInterface>> { todo!() } } diff --git a/crates/shirabe/src/downloader/gzip_downloader.rs b/crates/shirabe/src/downloader/gzip_downloader.rs index 43d174a..9a6a258 100644 --- a/crates/shirabe/src/downloader/gzip_downloader.rs +++ b/crates/shirabe/src/downloader/gzip_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, PATHINFO_FILENAME, PHP_URL_PATH, PhpMixed, RuntimeException, extension_loaded, fclose, fopen, fwrite, gzclose, gzopen, gzread, implode, parse_url, pathinfo, @@ -130,7 +130,7 @@ impl GzipDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for GzipDownloader { +impl crate::downloader::DownloaderInterface for GzipDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/hg_downloader.rs b/crates/shirabe/src/downloader/hg_downloader.rs index 4ccb150..986a214 100644 --- a/crates/shirabe/src/downloader/hg_downloader.rs +++ b/crates/shirabe/src/downloader/hg_downloader.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Downloader/HgDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::hg::Hg as HgUtils; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::Hg as HgUtils; +use crate::util::ProcessExecutor; use anyhow::Result; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::RuntimeException; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs b/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs index 4e18761..ebec74d 100644 --- a/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs +++ b/crates/shirabe/src/downloader/max_file_size_exceeded_exception.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/MaxFileSizeExceededException.php -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; #[derive(Debug)] pub struct MaxFileSizeExceededException(pub TransportException); diff --git a/crates/shirabe/src/downloader/mod.rs b/crates/shirabe/src/downloader/mod.rs index 391ae23..4f7641b 100644 --- a/crates/shirabe/src/downloader/mod.rs +++ b/crates/shirabe/src/downloader/mod.rs @@ -21,3 +21,27 @@ pub mod vcs_capable_downloader_interface; pub mod vcs_downloader; pub mod xz_downloader; pub mod zip_downloader; + +pub use archive_downloader::*; +pub use change_report_interface::*; +pub use download_manager::*; +pub use downloader_interface::*; +pub use dvcs_downloader_interface::*; +pub use file_downloader::*; +pub use filesystem_exception::*; +pub use fossil_downloader::*; +pub use git_downloader::*; +pub use gzip_downloader::*; +pub use hg_downloader::*; +pub use max_file_size_exceeded_exception::*; +pub use path_downloader::*; +pub use perforce_downloader::*; +pub use phar_downloader::*; +pub use rar_downloader::*; +pub use svn_downloader::*; +pub use tar_downloader::*; +pub use transport_exception::*; +pub use vcs_capable_downloader_interface::*; +pub use vcs_downloader::*; +pub use xz_downloader::*; +pub use zip_downloader::*; diff --git a/crates/shirabe/src/downloader/path_downloader.rs b/crates/shirabe/src/downloader/path_downloader.rs index 56ecf0f..126b521 100644 --- a/crates/shirabe/src/downloader/path_downloader.rs +++ b/crates/shirabe/src/downloader/path_downloader.rs @@ -3,9 +3,9 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::filesystem::exception::io_exception::IOException; -use shirabe_external_packages::symfony::component::filesystem::filesystem::Filesystem as SymfonyFilesystem; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::filesystem::Filesystem as SymfonyFilesystem; +use shirabe_external_packages::symfony::component::filesystem::exception::IOException; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, PHP_WINDOWS_VERSION_MAJOR, PHP_WINDOWS_VERSION_MINOR, PhpMixed, RuntimeException, file_exists, function_exists, is_dir, realpath, @@ -13,22 +13,22 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::downloader::VcsCapableDownloaderInterface; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::dumper::ArrayDumper; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct PathDownloader { diff --git a/crates/shirabe/src/downloader/perforce_downloader.rs b/crates/shirabe/src/downloader/perforce_downloader.rs index b2d05dd..02e32b4 100644 --- a/crates/shirabe/src/downloader/perforce_downloader.rs +++ b/crates/shirabe/src/downloader/perforce_downloader.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Downloader/PerforceDownloader.php use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::vcs_repository::VcsRepository; -use crate::util::filesystem::Filesystem; -use crate::util::perforce::Perforce; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::VcsRepository; +use crate::util::Filesystem; +use crate::util::Perforce; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PhpMixed; use std::any::Any; diff --git a/crates/shirabe/src/downloader/phar_downloader.rs b/crates/shirabe/src/downloader/phar_downloader.rs index f6c15b8..c805bb3 100644 --- a/crates/shirabe/src/downloader/phar_downloader.rs +++ b/crates/shirabe/src/downloader/phar_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::Phar; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/rar_downloader.rs b/crates/shirabe/src/downloader/rar_downloader.rs index 0366e28..d798664 100644 --- a/crates/shirabe/src/downloader/rar_downloader.rs +++ b/crates/shirabe/src/downloader/rar_downloader.rs @@ -2,19 +2,19 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -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::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::IniHelper; +use crate::util::Platform; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ PhpMixed, RarArchive, RuntimeException, UnexpectedValueException, class_exists, implode, }; @@ -144,7 +144,7 @@ impl RarDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for RarDownloader { +impl crate::downloader::DownloaderInterface for RarDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/svn_downloader.rs b/crates/shirabe/src/downloader/svn_downloader.rs index 5b20ff8..56eb891 100644 --- a/crates/shirabe/src/downloader/svn_downloader.rs +++ b/crates/shirabe/src/downloader/svn_downloader.rs @@ -2,20 +2,20 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_external_packages::react::promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{PhpMixed, RuntimeException, is_dir, version_compare}; use crate::config::Config; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_downloader::VcsDownloaderBase; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::vcs_repository::VcsRepository; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsDownloaderBase; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::VcsRepository; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; #[derive(Debug)] pub struct SvnDownloader { diff --git a/crates/shirabe/src/downloader/tar_downloader.rs b/crates/shirabe/src/downloader/tar_downloader.rs index 10d2614..a21e94d 100644 --- a/crates/shirabe/src/downloader/tar_downloader.rs +++ b/crates/shirabe/src/downloader/tar_downloader.rs @@ -2,18 +2,18 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PharData; #[derive(Debug)] diff --git a/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs b/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs index 6176704..68e9caa 100644 --- a/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs +++ b/crates/shirabe/src/downloader/vcs_capable_downloader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Downloader/VcsCapableDownloaderInterface.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait VcsCapableDownloaderInterface { fn get_vcs_reference(&self, package: &dyn PackageInterface, path: String) -> Option<String>; diff --git a/crates/shirabe/src/downloader/vcs_downloader.rs b/crates/shirabe/src/downloader/vcs_downloader.rs index cc8f9fb..1f041bd 100644 --- a/crates/shirabe/src/downloader/vcs_downloader.rs +++ b/crates/shirabe/src/downloader/vcs_downloader.rs @@ -3,7 +3,7 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_map, array_shift, count, explode, get_class, get_class_err, implode, rawurldecode, realpath, str_replace, strlen, strpos, substr, @@ -11,19 +11,19 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::downloader::change_report_interface::ChangeReportInterface; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::vcs_capable_downloader_interface::VcsCapableDownloaderInterface; -use crate::io::io_interface::IOInterface; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::ChangeReportInterface; +use crate::downloader::DownloaderInterface; +use crate::downloader::VcsCapableDownloaderInterface; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct VcsDownloaderBase { diff --git a/crates/shirabe/src/downloader/xz_downloader.rs b/crates/shirabe/src/downloader/xz_downloader.rs index a16341c..e90b263 100644 --- a/crates/shirabe/src/downloader/xz_downloader.rs +++ b/crates/shirabe/src/downloader/xz_downloader.rs @@ -2,17 +2,17 @@ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::ArchiveDownloader; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::{Result, bail}; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] @@ -78,7 +78,7 @@ impl XzDownloader { } } -impl crate::downloader::downloader_interface::DownloaderInterface for XzDownloader { +impl crate::downloader::DownloaderInterface for XzDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index 835c118..7cd5000 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Downloader/ZipDownloader.php -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::package::package_interface::PackageInterface; -use crate::util::ini_helper::IniHelper; -use crate::util::platform::Platform; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::package::PackageInterface; +use crate::util::IniHelper; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, ErrorException, RuntimeException, UnexpectedValueException, ZipArchive, bin2hex, class_exists, file_exists, file_get_contents, filesize, function_exists, hash_file, @@ -33,19 +33,15 @@ pub struct ZipDownloader { impl ZipDownloader { pub fn new( - io: Box<dyn crate::io::io_interface::IOInterface>, + io: Box<dyn crate::io::IOInterface>, config: std::rc::Rc<std::cell::RefCell<crate::config::Config>>, - http_downloader: std::rc::Rc< - std::cell::RefCell<crate::util::http_downloader::HttpDownloader>, - >, + http_downloader: std::rc::Rc<std::cell::RefCell<crate::util::HttpDownloader>>, event_dispatcher: Option< - std::rc::Rc< - std::cell::RefCell<crate::event_dispatcher::event_dispatcher::EventDispatcher>, - >, + std::rc::Rc<std::cell::RefCell<crate::event_dispatcher::EventDispatcher>>, >, cache: Option<crate::cache::Cache>, - filesystem: std::rc::Rc<std::cell::RefCell<crate::util::filesystem::Filesystem>>, - process: std::rc::Rc<std::cell::RefCell<crate::util::process_executor::ProcessExecutor>>, + filesystem: std::rc::Rc<std::cell::RefCell<crate::util::Filesystem>>, + process: std::rc::Rc<std::cell::RefCell<crate::util::ProcessExecutor>>, ) -> Self { Self { inner: FileDownloader::new( @@ -426,7 +422,7 @@ impl ZipDownloader { // TODO(phase-b): ZipDownloader::download is overridden with extra setup (UNZIP_COMMANDS init, // etc.). The trait method here delegates straight to the inner FileDownloader; the bespoke // override on the struct itself takes &mut self and is not yet routed through the trait. -impl crate::downloader::downloader_interface::DownloaderInterface for ZipDownloader { +impl crate::downloader::DownloaderInterface for ZipDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } diff --git a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs index 33da710..afda00c 100644 --- a/crates/shirabe/src/event_dispatcher/event_dispatcher.rs +++ b/crates/shirabe/src/event_dispatcher/event_dispatcher.rs @@ -2,12 +2,12 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::console::application::Application; -use shirabe_external_packages::symfony::component::console::input::string_input::StringInput; -use shirabe_external_packages::symfony::component::console::output::console_output::ConsoleOutput; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::php_executable_finder::PhpExecutableFinder; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::console::Application; +use shirabe_external_packages::symfony::component::console::input::StringInput; +use shirabe_external_packages::symfony::component::console::output::ConsoleOutput; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::PhpExecutableFinder; use shirabe_php_shim::{ Exception, InvalidArgumentException, LogicException, PATH_SEPARATOR, PHP_VERSION_ID, PhpMixed, RuntimeException, array_pop, array_push, array_search_in_vec, array_splice, class_exists, @@ -18,26 +18,26 @@ use shirabe_php_shim::{ substr, trim, }; -use crate::autoload::class_loader::ClassLoader; +use crate::autoload::ClassLoader; use crate::composer::Composer; -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::transaction::Transaction; -use crate::event_dispatcher::event::Event; -use crate::event_dispatcher::event_subscriber_interface::EventSubscriberInterface; -use crate::event_dispatcher::script_execution_exception::ScriptExecutionException; -use crate::installer::binary_installer::BinaryInstaller; -use crate::installer::installer_event::InstallerEvent; -use crate::installer::package_event::PackageEvent; -use crate::io::console_io::ConsoleIO; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; +use crate::dependency_resolver::Transaction; +use crate::dependency_resolver::operation::OperationInterface; +use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventSubscriberInterface; +use crate::event_dispatcher::ScriptExecutionException; +use crate::installer::BinaryInstaller; +use crate::installer::InstallerEvent; +use crate::installer::PackageEvent; +use crate::io::ConsoleIO; +use crate::io::IOInterface; +use crate::package::PackageInterface; use crate::partial_composer::PartialComposer; -use crate::plugin::command_event::CommandEvent; -use crate::plugin::pre_command_run_event::PreCommandRunEvent; -use crate::repository::repository_interface::RepositoryInterface; -use crate::script::event::Event as ScriptEvent; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::plugin::CommandEvent; +use crate::plugin::PreCommandRunEvent; +use crate::repository::RepositoryInterface; +use crate::script::Event as ScriptEvent; +use crate::util::Platform; +use crate::util::ProcessExecutor; /// Represents a callable listener. PHP's `callable` may be a string (command, script, or /// "Class::method"), a `[object|string, method]` pair, or a `\Closure`. @@ -214,7 +214,7 @@ impl EventDispatcher { .unwrap_or_default() ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -333,7 +333,7 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::VERBOSE, + crate::io::VERBOSE, ); } // TODO(plugin): actually invoke callable with $event and inspect result @@ -350,7 +350,7 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::VERBOSE, + crate::io::VERBOSE, ); let mut script: Vec<String> = substr(callable_str, 1, None) @@ -411,7 +411,7 @@ impl EventDispatcher { PhpMixed::String(callable_str.clone()), PhpMixed::String(event.get_name().to_string()), ], - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); return Err(anyhow::anyhow!(ScriptExecutionException( RuntimeException { @@ -435,7 +435,7 @@ impl EventDispatcher { self.io.write_error3(&sprintf( "<warning>You made a reference to a non-existent script %s</warning>", &[PhpMixed::String(callable_str.clone())], - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); } let composer_full = self.composer_as_full_or_panic(); @@ -470,7 +470,7 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::QUIET, + crate::io::QUIET, ); } return Err(e); @@ -489,7 +489,7 @@ impl EventDispatcher { "<warning>Class {} is not autoloadable, can not call {} script</warning>", class_name, event.get_name() - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); continue; } if !is_callable(&PhpMixed::String(callable_str.clone())) { @@ -497,7 +497,7 @@ impl EventDispatcher { "<warning>Method {} is not callable, can not call {} script</warning>", callable_str, event.get_name() - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); continue; } @@ -520,7 +520,7 @@ impl EventDispatcher { ) ), true, - crate::io::io_interface::QUIET, + crate::io::QUIET, ); return Err(e); } @@ -541,7 +541,7 @@ impl EventDispatcher { "<warning>Class {} is not autoloadable, can not call {} script</warning>", class_name, event.get_name() - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); continue; } if !is_a( @@ -553,7 +553,7 @@ impl EventDispatcher { "<warning>Class {} does not extend Symfony\\Component\\Console\\Command\\Command, can not call {} script</warning>", class_name, event.get_name() - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); continue; } if defined(&format!( @@ -563,7 +563,7 @@ impl EventDispatcher { self.io.write_error3(&format!( "<warning>You cannot bind {} to a Command class, use a non-reserved name</warning>", event.get_name() - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); continue; } @@ -628,7 +628,7 @@ impl EventDispatcher { ) ), true, - crate::io::io_interface::QUIET, + crate::io::QUIET, ); return Err(e); } @@ -668,13 +668,13 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } else if self.event_needs_to_output(event) { self.io.write_error3( &sprintf("> %s", &[PhpMixed::String(exec.clone())]), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -802,7 +802,7 @@ impl EventDispatcher { PhpMixed::String(callable_str.clone()), PhpMixed::String(event.get_name().to_string()), ], - ), true, crate::io::io_interface::QUIET); + ), true, crate::io::QUIET); return Err(anyhow::anyhow!(ScriptExecutionException( RuntimeException { @@ -922,7 +922,7 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } else if self.event_needs_to_output(event) { self.io.write_error3( @@ -934,7 +934,7 @@ impl EventDispatcher { ], ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -1069,7 +1069,7 @@ impl EventDispatcher { event.get_name() ), true, - crate::io::io_interface::VERBOSE, + crate::io::VERBOSE, ); return Vec::new(); diff --git a/crates/shirabe/src/event_dispatcher/mod.rs b/crates/shirabe/src/event_dispatcher/mod.rs index 97609be..5278691 100644 --- a/crates/shirabe/src/event_dispatcher/mod.rs +++ b/crates/shirabe/src/event_dispatcher/mod.rs @@ -2,3 +2,8 @@ pub mod event; pub mod event_dispatcher; pub mod event_subscriber_interface; pub mod script_execution_exception; + +pub use event::*; +pub use event_dispatcher::*; +pub use event_subscriber_interface::*; +pub use script_execution_exception::*; diff --git a/crates/shirabe/src/exception/mod.rs b/crates/shirabe/src/exception/mod.rs index d273f7e..0355e35 100644 --- a/crates/shirabe/src/exception/mod.rs +++ b/crates/shirabe/src/exception/mod.rs @@ -1,2 +1,5 @@ pub mod irrecoverable_download_exception; pub mod no_ssl_exception; + +pub use irrecoverable_download_exception::*; +pub use no_ssl_exception::*; diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs index 6dc2fbd..194a94f 100644 --- a/crates/shirabe/src/factory.rs +++ b/crates/shirabe/src/factory.rs @@ -2,9 +2,9 @@ use indexmap::IndexMap; -use shirabe_external_packages::symfony::component::console::formatter::output_formatter::OutputFormatter; -use shirabe_external_packages::symfony::component::console::formatter::output_formatter_style::OutputFormatterStyle; -use shirabe_external_packages::symfony::component::console::output::console_output::ConsoleOutput; +use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter; +use shirabe_external_packages::symfony::component::console::formatter::OutputFormatterStyle; +use shirabe_external_packages::symfony::component::console::output::ConsoleOutput; use shirabe_php_shim::{ InvalidArgumentException, PATHINFO_EXTENSION, PHP_EOL, Phar, PhpMixed, RuntimeException, UnexpectedValueException, ZipArchive, array_keys, array_replace_recursive, class_exists, @@ -13,59 +13,59 @@ use shirabe_php_shim::{ strpos, strtr, substr, trim, }; -use crate::autoload::autoload_generator::AutoloadGenerator; +use crate::autoload::AutoloadGenerator; use crate::cache::Cache; use crate::composer::Composer; use crate::config::Config; -use crate::config::json_config_source::JsonConfigSource; -use crate::downloader::download_manager::DownloadManager; -use crate::downloader::file_downloader::FileDownloader; -use crate::downloader::fossil_downloader::FossilDownloader; -use crate::downloader::git_downloader::GitDownloader; -use crate::downloader::gzip_downloader::GzipDownloader; -use crate::downloader::hg_downloader::HgDownloader; -use crate::downloader::path_downloader::PathDownloader; -use crate::downloader::perforce_downloader::PerforceDownloader; -use crate::downloader::phar_downloader::PharDownloader; -use crate::downloader::rar_downloader::RarDownloader; -use crate::downloader::svn_downloader::SvnDownloader; -use crate::downloader::tar_downloader::TarDownloader; -use crate::downloader::transport_exception::TransportException; -use crate::downloader::xz_downloader::XzDownloader; -use crate::downloader::zip_downloader::ZipDownloader; -use crate::event_dispatcher::event::Event; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::exception::no_ssl_exception::NoSslException; -use crate::installer::binary_installer::BinaryInstaller; -use crate::installer::installation_manager::InstallationManager; -use crate::installer::library_installer::LibraryInstaller; -use crate::installer::metapackage_installer::MetapackageInstaller; -use crate::installer::plugin_installer::PluginInstaller; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_validation_exception::JsonValidationException; -use crate::package::archiver::archive_manager::ArchiveManager; -use crate::package::archiver::phar_archiver::PharArchiver; -use crate::package::archiver::zip_archiver::ZipArchiver; -use crate::package::loader::root_package_loader::RootPackageLoader; -use crate::package::locker::Locker; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; +use crate::config::JsonConfigSource; +use crate::downloader::DownloadManager; +use crate::downloader::FileDownloader; +use crate::downloader::FossilDownloader; +use crate::downloader::GitDownloader; +use crate::downloader::GzipDownloader; +use crate::downloader::HgDownloader; +use crate::downloader::PathDownloader; +use crate::downloader::PerforceDownloader; +use crate::downloader::PharDownloader; +use crate::downloader::RarDownloader; +use crate::downloader::SvnDownloader; +use crate::downloader::TarDownloader; +use crate::downloader::TransportException; +use crate::downloader::XzDownloader; +use crate::downloader::ZipDownloader; +use crate::event_dispatcher::Event; +use crate::event_dispatcher::EventDispatcher; +use crate::exception::NoSslException; +use crate::installer::BinaryInstaller; +use crate::installer::InstallationManager; +use crate::installer::LibraryInstaller; +use crate::installer::MetapackageInstaller; +use crate::installer::PluginInstaller; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::json::JsonValidationException; +use crate::package::Locker; +use crate::package::RootPackageInterface; +use crate::package::archiver::ArchiveManager; +use crate::package::archiver::PharArchiver; +use crate::package::archiver::ZipArchiver; +use crate::package::loader::RootPackageLoader; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; use crate::partial_composer::PartialComposer; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::plugin_manager::PluginManager; -use crate::repository::filesystem_repository::FilesystemRepository; -use crate::repository::installed_filesystem_repository::InstalledFilesystemRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_manager::RepositoryManager; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; +use crate::plugin::PluginEvents; +use crate::plugin::PluginManager; +use crate::repository::FilesystemRepository; +use crate::repository::InstalledFilesystemRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::RepositoryFactory; +use crate::repository::RepositoryManager; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Silencer; use crate::util::r#loop::Loop; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; /// Either a configuration array or a filename to read from. PHP's `$localConfig` accepts both. pub enum LocalConfigInput { @@ -267,7 +267,7 @@ impl Factory { io_ref.write_error3( &format!("Loading config file {}", file.get_path()), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } // TODO(phase-b): validate_json_schema takes ownership of JsonFile; recreate it @@ -328,7 +328,7 @@ impl Factory { io_ref.write_error3( &format!("Loading config file {}", auth_file.get_path()), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } // TODO(phase-b): validate_json_schema takes ownership; recreate JsonFile @@ -524,7 +524,7 @@ impl Factory { realpath(composer_file_path).unwrap_or_default() ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); config.set_config_source(Box::new(JsonConfigSource::new( JsonFile::new( @@ -547,7 +547,7 @@ impl Factory { io.write_error3( &format!("Loading config file {}", local_auth_file.get_path()), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); // TODO(phase-b): validate_json_schema/ValidateJsonInput::File expects an owned // JsonFile (PHP class semantics share refs); needs Rc<RefCell<JsonFile>> refactor. @@ -734,7 +734,7 @@ impl Factory { lock_file ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -898,7 +898,7 @@ impl Factory { io.write_error3( &format!("Failed to initialize global composer: {}", e), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); None } @@ -1289,7 +1289,7 @@ impl Factory { io.write_error3( "<warning>You are running Composer with SSL/TLS protection disabled.</warning>", true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } unsafe { WARNED = true }; @@ -1347,17 +1347,17 @@ impl Factory { io.write3( "<error>Unable to locate a valid CA certificate file. You must set a valid 'cafile' option.</error>", true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); io.write3( "<error>A valid CA certificate file is required for SSL/TLS protection.</error>", true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); io.write3( "<error>You can disable this error, at your own risk, by setting the 'disable-tls' option to true.</error>", true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } } @@ -1392,7 +1392,7 @@ impl Factory { io_ref.write_error3( "Loading auth config from COMPOSER_AUTH", true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } Self::validate_json_schema( @@ -1469,11 +1469,7 @@ impl Factory { implode(&format!("{} - ", PHP_EOL), jve.get_errors()) ); if let Some(io_ref) = io { - io_ref.write_error3( - &format!("<warning>{}</>", msg), - true, - crate::io::io_interface::NORMAL, - ); + io_ref.write_error3(&format!("<warning>{}</>", msg), true, crate::io::NORMAL); } else { return Err(anyhow::anyhow!(UnexpectedValueException { message: msg, diff --git a/crates/shirabe/src/filter/mod.rs b/crates/shirabe/src/filter/mod.rs index 134a679..a5f35c5 100644 --- a/crates/shirabe/src/filter/mod.rs +++ b/crates/shirabe/src/filter/mod.rs @@ -1 +1,3 @@ pub mod platform_requirement_filter; + +pub use platform_requirement_filter::*; diff --git a/crates/shirabe/src/filter/platform_requirement_filter/ignore_all_platform_requirement_filter.rs b/crates/shirabe/src/filter/platform_requirement_filter/ignore_all_platform_requirement_filter.rs index 218a52d..ab9c833 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/ignore_all_platform_requirement_filter.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/ignore_all_platform_requirement_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Filter/PlatformRequirementFilter/IgnoreAllPlatformRequirementFilter.php -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::repository::platform_repository::PlatformRepository; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::repository::PlatformRepository; #[derive(Debug)] pub struct IgnoreAllPlatformRequirementFilter; diff --git a/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs b/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs index 39a0c03..f6b8091 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/ignore_list_platform_requirement_filter.rs @@ -1,16 +1,16 @@ //! ref: composer/src/Composer/Filter/PlatformRequirementFilter/IgnoreListPlatformRequirementFilter.php -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; +use shirabe_semver::constraint::MultiConstraint; use shirabe_semver::interval::Interval; use shirabe_semver::intervals::Intervals; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; use crate::package::base_package::{self, BasePackage}; -use crate::repository::platform_repository::PlatformRepository; +use crate::repository::PlatformRepository; #[derive(Debug)] pub struct IgnoreListPlatformRequirementFilter { diff --git a/crates/shirabe/src/filter/platform_requirement_filter/ignore_nothing_platform_requirement_filter.rs b/crates/shirabe/src/filter/platform_requirement_filter/ignore_nothing_platform_requirement_filter.rs index 21da158..2d47ff9 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/ignore_nothing_platform_requirement_filter.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/ignore_nothing_platform_requirement_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Filter/PlatformRequirementFilter/IgnoreNothingPlatformRequirementFilter.php -use super::platform_requirement_filter_interface::PlatformRequirementFilterInterface; +use super::PlatformRequirementFilterInterface; #[derive(Debug)] pub struct IgnoreNothingPlatformRequirementFilter; diff --git a/crates/shirabe/src/filter/platform_requirement_filter/mod.rs b/crates/shirabe/src/filter/platform_requirement_filter/mod.rs index fdd7feb..0a6556f 100644 --- a/crates/shirabe/src/filter/platform_requirement_filter/mod.rs +++ b/crates/shirabe/src/filter/platform_requirement_filter/mod.rs @@ -3,3 +3,9 @@ pub mod ignore_list_platform_requirement_filter; pub mod ignore_nothing_platform_requirement_filter; pub mod platform_requirement_filter_factory; pub mod platform_requirement_filter_interface; + +pub use ignore_all_platform_requirement_filter::*; +pub use ignore_list_platform_requirement_filter::*; +pub use ignore_nothing_platform_requirement_filter::*; +pub use platform_requirement_filter_factory::*; +pub use platform_requirement_filter_interface::*; diff --git a/crates/shirabe/src/installed_versions.rs b/crates/shirabe/src/installed_versions.rs index c79e9d8..644cc8e 100644 --- a/crates/shirabe/src/installed_versions.rs +++ b/crates/shirabe/src/installed_versions.rs @@ -11,7 +11,7 @@ use shirabe_php_shim::{ }; use shirabe_semver::version_parser::VersionParser; -use crate::autoload::class_loader::ClassLoader; +use crate::autoload::ClassLoader; /// This class is copied in every Composer installed project and available to all /// diff --git a/crates/shirabe/src/installer.rs b/crates/shirabe/src/installer.rs index 55e45e5..b9236a1 100644 --- a/crates/shirabe/src/installer.rs +++ b/crates/shirabe/src/installer.rs @@ -1,24 +1,39 @@ //! ref: composer/src/Composer/Installer.php -pub mod binary_installer; -pub mod binary_presence_interface; -pub mod installation_manager; -pub mod installer_event; -pub mod installer_events; -pub mod installer_interface; -pub mod library_installer; -pub mod metapackage_installer; -pub mod noop_installer; -pub mod package_event; -pub mod package_events; -pub mod plugin_installer; -pub mod project_installer; -pub mod suggested_packages_reporter; +mod binary_installer; +mod binary_presence_interface; +mod installation_manager; +mod installer_event; +mod installer_events; +mod installer_interface; +mod library_installer; +mod metapackage_installer; +mod noop_installer; +mod package_event; +mod package_events; +mod plugin_installer; +mod project_installer; +mod suggested_packages_reporter; + +pub use binary_installer::*; +pub use binary_presence_interface::*; +pub use installation_manager::*; +pub use installer_event::*; +pub use installer_events::*; +pub use installer_interface::*; +pub use library_installer::*; +pub use metapackage_installer::*; +pub use noop_installer::*; +pub use package_event::*; +pub use package_events::*; +pub use plugin_installer::*; +pub use project_installer::*; +pub use suggested_packages_reporter::*; use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; +use shirabe_external_packages::seld::json_lint::ParsingException; use shirabe_php_shim::{ PhpMixed, RuntimeException, array_flip, array_map, array_merge, array_unique, array_values, clone, count, defined, gc_collect_cycles, gc_disable, gc_enable, get_class, implode, in_array, @@ -27,66 +42,63 @@ use shirabe_php_shim::{ }; use shirabe_semver; -use crate::advisory::audit_config::AuditConfig; -use crate::advisory::auditor::Auditor; -use crate::autoload::autoload_generator::AutoloadGenerator; +use crate::advisory::AuditConfig; +use crate::advisory::Auditor; +use crate::autoload::AutoloadGenerator; use crate::composer::Composer; use crate::config::Config; -use crate::console::github_action_error::GithubActionError; -use crate::dependency_resolver::default_policy::DefaultPolicy; -use crate::dependency_resolver::local_repo_transaction::LocalRepoTransaction; -use crate::dependency_resolver::lock_transaction::LockTransaction; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::dependency_resolver::policy_interface::PolicyInterface; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::pool_optimizer::PoolOptimizer; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::security_advisory_pool_filter::SecurityAdvisoryPoolFilter; -use crate::dependency_resolver::solver::Solver; -use crate::dependency_resolver::solver_problems_exception::SolverProblemsException; -use crate::downloader::download_manager::DownloadManager; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::platform_requirement_filter_factory::PlatformRequirementFilterFactory; -use crate::filter::platform_requirement_filter::platform_requirement_filter_interface::PlatformRequirementFilterInterface; -use crate::installer::installation_manager::InstallationManager; -use crate::installer::installer_events::InstallerEvents; -use crate::installer::suggested_packages_reporter::SuggestedPackagesReporter; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; +use crate::console::GithubActionError; +use crate::dependency_resolver::DefaultPolicy; +use crate::dependency_resolver::LocalRepoTransaction; +use crate::dependency_resolver::LockTransaction; +use crate::dependency_resolver::PolicyInterface; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::PoolOptimizer; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::SecurityAdvisoryPoolFilter; +use crate::dependency_resolver::Solver; +use crate::dependency_resolver::SolverProblemsException; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::DownloadManager; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::Locker; +use crate::package::Package; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::link::Link; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::locker::Locker; -use crate::package::package::Package; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::installed_array_repository::InstalledArrayRepository; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_manager::RepositoryManager; -use crate::repository::repository_set::RepositorySet; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::script::script_events::ScriptEvents; -use crate::util::platform::Platform; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; +use crate::repository::ArrayRepository; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::CompositeRepository; +use crate::repository::InstalledArrayRepository; +use crate::repository::InstalledRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositoryManager; +use crate::repository::RepositorySet; +use crate::repository::RootPackageRepository; +use crate::script::ScriptEvents; +use crate::util::Platform; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct Installer { @@ -1283,7 +1295,7 @@ impl Installer { ); // TODO(phase-b): convert root_aliases (Vec<IndexMap<String, String>>) into Vec<RootAliasInput> - let root_aliases_input: Vec<crate::repository::repository_set::RootAliasInput> = vec![]; + let root_aliases_input: Vec<crate::repository::RootAliasInput> = vec![]; let _ = root_aliases; // TODO(phase-b): temporary_constraints holds Box<dyn ConstraintInterface> which can't Clone let temporary_constraints: IndexMap<String, Box<dyn ConstraintInterface>> = IndexMap::new(); diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs index aea0a7c..54e1143 100644 --- a/crates/shirabe/src/installer/binary_installer.rs +++ b/crates/shirabe/src/installer/binary_installer.rs @@ -2,19 +2,19 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ PhpMixed, basename, basename_with_suffix, chmod, dirname, fclose, fgets, file_exists, file_get_contents, file_put_contents, fopen, is_dir, is_file, is_link, realpath, rmdir, substr, trim, umask, }; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Silencer; /// Utility to handle installation of package "bin"/binaries #[derive(Debug)] diff --git a/crates/shirabe/src/installer/binary_presence_interface.rs b/crates/shirabe/src/installer/binary_presence_interface.rs index c91c3e3..8830bab 100644 --- a/crates/shirabe/src/installer/binary_presence_interface.rs +++ b/crates/shirabe/src/installer/binary_presence_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Installer/BinaryPresenceInterface.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait BinaryPresenceInterface { fn ensure_binaries_presence(&self, package: &dyn PackageInterface); diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs index 3b342a9..479e478 100644 --- a/crates/shirabe/src/installer/installation_manager.rs +++ b/crates/shirabe/src/installer/installation_manager.rs @@ -4,32 +4,32 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; use shirabe_external_packages::react::promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::seld::signal::SignalHandler; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, array_search_mixed, array_splice, array_unshift, count, http_build_query, json_encode, str_contains, str_replace, strpos, strtolower, ucfirst, }; -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::mark_alias_installed_operation::MarkAliasInstalledOperation; -use crate::dependency_resolver::operation::mark_alias_uninstalled_operation::MarkAliasUninstalledOperation; -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::downloader::file_downloader::FileDownloader; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::installer::binary_presence_interface::BinaryPresenceInterface; -use crate::installer::installer_interface::InstallerInterface; -use crate::installer::package_events::PackageEvents; -use crate::installer::plugin_installer::PluginInstaller; -use crate::io::console_io::ConsoleIO; -use crate::io::io_interface::IOInterface; -use crate::package::alias_package::AliasPackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::MarkAliasInstalledOperation; +use crate::dependency_resolver::operation::MarkAliasUninstalledOperation; +use crate::dependency_resolver::operation::OperationInterface; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::downloader::FileDownloader; +use crate::event_dispatcher::EventDispatcher; +use crate::installer::BinaryPresenceInterface; +use crate::installer::InstallerInterface; +use crate::installer::PackageEvents; +use crate::installer::PluginInstaller; +use crate::io::ConsoleIO; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::PackageInterface; +use crate::repository::InstalledRepositoryInterface; +use crate::util::Platform; use crate::util::r#loop::Loop; -use crate::util::platform::Platform; /// Package operation manager. #[derive(Debug)] diff --git a/crates/shirabe/src/installer/installer_event.rs b/crates/shirabe/src/installer/installer_event.rs index 20a8b27..6d4bf0b 100644 --- a/crates/shirabe/src/installer/installer_event.rs +++ b/crates/shirabe/src/installer/installer_event.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Installer/InstallerEvent.php use crate::composer::Composer; -use crate::dependency_resolver::transaction::Transaction; -use crate::event_dispatcher::event::Event; -use crate::io::io_interface::IOInterface; +use crate::dependency_resolver::Transaction; +use crate::event_dispatcher::Event; +use crate::io::IOInterface; #[derive(Debug)] pub struct InstallerEvent { diff --git a/crates/shirabe/src/installer/installer_interface.rs b/crates/shirabe/src/installer/installer_interface.rs index a9e8d9b..5370364 100644 --- a/crates/shirabe/src/installer/installer_interface.rs +++ b/crates/shirabe/src/installer/installer_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Installer/InstallerInterface.php -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::package::PackageInterface; +use crate::repository::InstalledRepositoryInterface; +use shirabe_external_packages::react::promise::PromiseInterface; pub trait InstallerInterface: std::fmt::Debug { fn supports(&self, package_type: &str) -> bool; diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs index fc79bdd..0b4ba78 100644 --- a/crates/shirabe/src/installer/library_installer.rs +++ b/crates/shirabe/src/installer/library_installer.rs @@ -3,24 +3,24 @@ use std::any::Any; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, is_link, preg_quote, realpath, rmdir, rtrim, strpos, }; use crate::composer::Composer; -use crate::downloader::download_manager::DownloadManager; -use crate::installer::binary_installer::BinaryInstaller; -use crate::installer::binary_presence_interface::BinaryPresenceInterface; -use crate::installer::installer_interface::InstallerInterface; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; +use crate::downloader::DownloadManager; +use crate::installer::BinaryInstaller; +use crate::installer::BinaryPresenceInterface; +use crate::installer::InstallerInterface; +use crate::io::IOInterface; +use crate::package::PackageInterface; use crate::partial_composer::PartialComposer; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::silencer::Silencer; +use crate::repository::InstalledRepositoryInterface; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::Silencer; /// Package installation manager. #[derive(Debug)] diff --git a/crates/shirabe/src/installer/metapackage_installer.rs b/crates/shirabe/src/installer/metapackage_installer.rs index e30ef85..2c23229 100644 --- a/crates/shirabe/src/installer/metapackage_installer.rs +++ b/crates/shirabe/src/installer/metapackage_installer.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Installer/MetapackageInstaller.php -use crate::dependency_resolver::operation::install_operation::InstallOperation; -use crate::dependency_resolver::operation::uninstall_operation::UninstallOperation; -use crate::dependency_resolver::operation::update_operation::UpdateOperation; -use crate::installer::installer_interface::InstallerInterface; +use crate::dependency_resolver::operation::InstallOperation; +use crate::dependency_resolver::operation::UninstallOperation; +use crate::dependency_resolver::operation::UpdateOperation; +use crate::installer::InstallerInterface; +use crate::io::IOInterface; use crate::io::io_interface; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; +use crate::package::PackageInterface; +use crate::repository::InstalledRepositoryInterface; use anyhow::Result; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::InvalidArgumentException; #[derive(Debug)] diff --git a/crates/shirabe/src/installer/noop_installer.rs b/crates/shirabe/src/installer/noop_installer.rs index 8180402..360f962 100644 --- a/crates/shirabe/src/installer/noop_installer.rs +++ b/crates/shirabe/src/installer/noop_installer.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Installer/NoopInstaller.php -use crate::installer::installer_interface::InstallerInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::installer::InstallerInterface; +use crate::package::PackageInterface; +use crate::repository::InstalledRepositoryInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::InvalidArgumentException; #[derive(Debug)] diff --git a/crates/shirabe/src/installer/package_event.rs b/crates/shirabe/src/installer/package_event.rs index 8b6fbbe..0268721 100644 --- a/crates/shirabe/src/installer/package_event.rs +++ b/crates/shirabe/src/installer/package_event.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Installer/PackageEvent.php use crate::composer::Composer; -use crate::dependency_resolver::operation::operation_interface::OperationInterface; -use crate::event_dispatcher::event::Event; -use crate::io::io_interface::IOInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::dependency_resolver::operation::OperationInterface; +use crate::event_dispatcher::Event; +use crate::io::IOInterface; +use crate::repository::RepositoryInterface; use indexmap::IndexMap; #[derive(Debug)] diff --git a/crates/shirabe/src/installer/plugin_installer.rs b/crates/shirabe/src/installer/plugin_installer.rs index 2ec8cb9..dff57d8 100644 --- a/crates/shirabe/src/installer/plugin_installer.rs +++ b/crates/shirabe/src/installer/plugin_installer.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Installer/PluginInstaller.php -use crate::installer::binary_installer::BinaryInstaller; -use crate::installer::installer_interface::InstallerInterface; -use crate::installer::library_installer::LibraryInstaller; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; +use crate::installer::BinaryInstaller; +use crate::installer::InstallerInterface; +use crate::installer::LibraryInstaller; +use crate::io::IOInterface; +use crate::package::PackageInterface; use crate::partial_composer::PartialComposer; -use crate::plugin::plugin_manager::PluginManager; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::plugin::PluginManager; +use crate::repository::InstalledRepositoryInterface; +use crate::util::Filesystem; +use crate::util::Platform; use anyhow::Result; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{LogicException, PhpMixed, UnexpectedValueException, empty}; #[derive(Debug)] diff --git a/crates/shirabe/src/installer/project_installer.rs b/crates/shirabe/src/installer/project_installer.rs index 6f794af..ad2c3a6 100644 --- a/crates/shirabe/src/installer/project_installer.rs +++ b/crates/shirabe/src/installer/project_installer.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Installer/ProjectInstaller.php -use crate::downloader::download_manager::DownloadManager; -use crate::installer::installer_interface::InstallerInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::util::filesystem::Filesystem; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::downloader::DownloadManager; +use crate::installer::InstallerInterface; +use crate::package::PackageInterface; +use crate::repository::InstalledRepositoryInterface; +use crate::util::Filesystem; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::InvalidArgumentException; #[derive(Debug)] diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs index 8248f5f..fc4165a 100644 --- a/crates/shirabe/src/installer/suggested_packages_reporter.rs +++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs @@ -1,12 +1,12 @@ //! ref: composer/src/Composer/Installer/SuggestedPackagesReporter.php -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::InstalledRepository; +use crate::repository::RepositoryInterface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::formatter::output_formatter::OutputFormatter; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::formatter::OutputFormatter; #[derive(Debug)] pub struct SuggestedPackagesReporter { diff --git a/crates/shirabe/src/io/base_io.rs b/crates/shirabe/src/io/base_io.rs index f2b7ee5..f778336 100644 --- a/crates/shirabe/src/io/base_io.rs +++ b/crates/shirabe/src/io/base_io.rs @@ -1,13 +1,13 @@ //! ref: composer/src/Composer/IO/BaseIO.php use crate::config::Config; +use crate::io::IOInterface; use crate::io::io_interface; -use crate::io::io_interface::IOInterface; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; +use crate::util::ProcessExecutor; +use crate::util::Silencer; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::psr::log::log_level::LogLevel; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::psr::log::LogLevel; use shirabe_php_shim::{ JSON_INVALID_UTF8_IGNORE, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed, UnexpectedValueException, array_merge, in_array, json_encode_ex, diff --git a/crates/shirabe/src/io/buffer_io.rs b/crates/shirabe/src/io/buffer_io.rs index ce4070a..867eb0e 100644 --- a/crates/shirabe/src/io/buffer_io.rs +++ b/crates/shirabe/src/io/buffer_io.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/IO/BufferIO.php -use crate::io::console_io::ConsoleIO; +use crate::io::ConsoleIO; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet; -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::symfony::console::formatter::output_formatter_interface::OutputFormatterInterface; -use shirabe_external_packages::symfony::console::helper::question_helper::QuestionHelper; -use shirabe_external_packages::symfony::console::output::stream_output::StreamOutput; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::console::helper::HelperSet; +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_external_packages::symfony::console::formatter::OutputFormatterInterface; +use shirabe_external_packages::symfony::console::helper::QuestionHelper; +use shirabe_external_packages::symfony::console::output::StreamOutput; use shirabe_php_shim::{ PHP_EOL, PhpMixed, RuntimeException, fopen, fseek, fwrite, rewind, stream_get_contents, strip_tags, @@ -71,16 +71,16 @@ impl BufferIO { let output = Preg::replace_callback( r"{(?<=^|\n|\x08)(.+?)(\x08+)}", |matches: &indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, >| -> String { let empty = String::new(); let g1 = matches - .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1)) + .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(1)) .unwrap_or(&empty); let g2 = matches - .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(2)) + .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(2)) .unwrap_or(&empty); let pre = strip_tags(g1); @@ -131,7 +131,7 @@ impl BufferIO { // TODO(phase-b): PHP `class BufferIO extends ConsoleIO` — delegate all IOInterface, // LoggerInterface, and BaseIO methods to `self.inner` (ConsoleIO). -impl shirabe_external_packages::psr::log::logger_interface::LoggerInterface for BufferIO { +impl shirabe_external_packages::psr::log::LoggerInterface for BufferIO { fn emergency(&self, message: &str, context: &[(&str, &str)]) { self.inner.emergency(message, context) } @@ -161,7 +161,7 @@ impl shirabe_external_packages::psr::log::logger_interface::LoggerInterface for } } -impl crate::io::io_interface::IOInterface for BufferIO { +impl crate::io::IOInterface for BufferIO { fn is_interactive(&self) -> bool { self.inner.is_interactive() } @@ -261,7 +261,7 @@ impl crate::io::io_interface::IOInterface for BufferIO { } } -impl crate::io::base_io::BaseIO for BufferIO { +impl crate::io::BaseIO for BufferIO { fn authentications( &self, ) -> &indexmap::IndexMap<String, indexmap::IndexMap<String, Option<String>>> { diff --git a/crates/shirabe/src/io/console_io.rs b/crates/shirabe/src/io/console_io.rs index 2182c37..b4bae47 100644 --- a/crates/shirabe/src/io/console_io.rs +++ b/crates/shirabe/src/io/console_io.rs @@ -4,18 +4,18 @@ use crate::config::Config; use crate::io::io_interface; use indexmap::IndexMap; use indexmap::indexmap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::psr::log::logger_interface::LoggerInterface; -use shirabe_external_packages::symfony::component::console::helper::helper_set::HelperSet; -use shirabe_external_packages::symfony::component::console::helper::progress_bar::ProgressBar; -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::console_output_interface::ConsoleOutputInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::psr::log::LoggerInterface; +use shirabe_external_packages::symfony::component::console::helper::HelperSet; +use shirabe_external_packages::symfony::component::console::helper::ProgressBar; +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::ConsoleOutputInterface; use shirabe_external_packages::symfony::component::console::output::output_interface::{ self as output_interface, OutputInterface, }; -use shirabe_external_packages::symfony::component::console::question::choice_question::ChoiceQuestion; -use shirabe_external_packages::symfony::component::console::question::question::Question; +use shirabe_external_packages::symfony::component::console::question::ChoiceQuestion; +use shirabe_external_packages::symfony::component::console::question::Question; use shirabe_php_shim::{ PhpMixed, array_filter, array_keys, array_search, count, function_exists, implode, in_array, is_array, is_string, mb_check_encoding, mb_convert_encoding, microtime, sprintf, str_repeat, @@ -23,10 +23,10 @@ use shirabe_php_shim::{ }; use std::cell::RefCell; -use crate::io::base_io::BaseIO; -use crate::io::io_interface::IOInterface; -use crate::question::strict_confirmation_question::StrictConfirmationQuestion; -use crate::util::silencer::Silencer; +use crate::io::BaseIO; +use crate::io::IOInterface; +use crate::question::StrictConfirmationQuestion; +use crate::util::Silencer; /// The Input/Output helper. pub struct ConsoleIO { diff --git a/crates/shirabe/src/io/io_interface.rs b/crates/shirabe/src/io/io_interface.rs index f014594..1d97700 100644 --- a/crates/shirabe/src/io/io_interface.rs +++ b/crates/shirabe/src/io/io_interface.rs @@ -2,7 +2,7 @@ use crate::config::Config; use indexmap::IndexMap; -use shirabe_external_packages::psr::log::logger_interface::LoggerInterface; +use shirabe_external_packages::psr::log::LoggerInterface; use shirabe_php_shim::PhpMixed; pub const QUIET: i64 = 1; diff --git a/crates/shirabe/src/io/mod.rs b/crates/shirabe/src/io/mod.rs index a75d459..f7c8ad1 100644 --- a/crates/shirabe/src/io/mod.rs +++ b/crates/shirabe/src/io/mod.rs @@ -3,3 +3,9 @@ pub mod buffer_io; pub mod console_io; pub mod io_interface; pub mod null_io; + +pub use base_io::*; +pub use buffer_io::*; +pub use console_io::*; +pub use io_interface::*; +pub use null_io::*; diff --git a/crates/shirabe/src/io/null_io.rs b/crates/shirabe/src/io/null_io.rs index 1a06e6e..e3cfdcf 100644 --- a/crates/shirabe/src/io/null_io.rs +++ b/crates/shirabe/src/io/null_io.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/IO/NullIO.php -use crate::io::base_io::BaseIO; -use crate::io::io_interface::IOInterface; -use shirabe_external_packages::psr::log::logger_interface::LoggerInterface; +use crate::io::BaseIO; +use crate::io::IOInterface; +use shirabe_external_packages::psr::log::LoggerInterface; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs index 4a2d079..3340cae 100644 --- a/crates/shirabe/src/json/json_file.rs +++ b/crates/shirabe/src/json/json_file.rs @@ -1,13 +1,13 @@ //! ref: composer/src/Composer/Json/JsonFile.php use crate::io::io_interface; -use crate::util::silencer::Silencer; +use crate::util::Silencer; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::json_schema::validator::Validator; -use shirabe_external_packages::seld::json_lint::json_parser::JsonParser; -use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::json_schema::Validator; +use shirabe_external_packages::seld::json_lint::JsonParser; +use shirabe_external_packages::seld::json_lint::ParsingException; use shirabe_php_shim::{ InvalidArgumentException, JSON_ERROR_CTRL_CHAR, JSON_ERROR_DEPTH, JSON_ERROR_NONE, JSON_ERROR_STATE_MISMATCH, JSON_ERROR_UTF8, JSON_PRETTY_PRINT, JSON_UNESCAPED_SLASHES, @@ -17,11 +17,11 @@ use shirabe_php_shim::{ str_repeat, strlen, strpos, usleep, }; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_validation_exception::JsonValidationException; -use crate::util::filesystem::Filesystem; -use crate::util::http_downloader::HttpDownloader; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonValidationException; +use crate::util::Filesystem; +use crate::util::HttpDownloader; /// Reads/writes json files. #[derive(Debug)] @@ -417,16 +417,12 @@ impl JsonFile { return Preg::replace_callback( r"#^ {4,}#m", move |m: &indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, >| -> String { let whole = m - .get( - &shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex( - 0, - ), - ) + .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(0)) .map(|s| s.as_str()) .unwrap_or(""); str_repeat(&indent_owned, (strlen(whole) / 4) as usize) diff --git a/crates/shirabe/src/json/json_formatter.rs b/crates/shirabe/src/json/json_formatter.rs index 47680b1..260bf1e 100644 --- a/crates/shirabe/src/json/json_formatter.rs +++ b/crates/shirabe/src/json/json_formatter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Json/JsonFormatter.php -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{PhpMixed, function_exists, mb_convert_encoding, pack}; pub struct JsonFormatter; diff --git a/crates/shirabe/src/json/json_manipulator.rs b/crates/shirabe/src/json/json_manipulator.rs index 7dee06f..c9ca7f7 100644 --- a/crates/shirabe/src/json/json_manipulator.rs +++ b/crates/shirabe/src/json/json_manipulator.rs @@ -2,7 +2,7 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ ArrayObject, InvalidArgumentException, LogicException, PREG_BACKTRACK_LIMIT_ERROR, PhpMixed, RuntimeException, StdClass, addcslashes, array_key_exists, array_keys, array_reverse, count, @@ -11,8 +11,8 @@ use shirabe_php_shim::{ trim, uksort, }; -use crate::json::json_file::JsonFile; -use crate::repository::platform_repository::PlatformRepository; +use crate::json::JsonFile; +use crate::repository::PlatformRepository; #[derive(Debug)] pub struct JsonManipulator { diff --git a/crates/shirabe/src/json/mod.rs b/crates/shirabe/src/json/mod.rs index 3e5f22c..0863529 100644 --- a/crates/shirabe/src/json/mod.rs +++ b/crates/shirabe/src/json/mod.rs @@ -2,3 +2,8 @@ pub mod json_file; pub mod json_formatter; pub mod json_manipulator; pub mod json_validation_exception; + +pub use json_file::*; +pub use json_formatter::*; +pub use json_manipulator::*; +pub use json_validation_exception::*; diff --git a/crates/shirabe/src/package/alias_package.rs b/crates/shirabe/src/package/alias_package.rs index 0049d89..0d687a1 100644 --- a/crates/shirabe/src/package/alias_package.rs +++ b/crates/shirabe/src/package/alias_package.rs @@ -3,13 +3,13 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::{PhpMixed, in_array}; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct AliasPackage { @@ -185,7 +185,10 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); + shirabe_semver::constraint::ConstraintInterface::set_pretty_string( + &mut constraint, + Some(pretty_version.clone()), + ); new_links.push(new_link); } } @@ -205,7 +208,10 @@ impl AliasPackage { Some(link_type.to_string()), Some(pretty_version.clone()), ); - shirabe_semver::constraint::constraint_interface::ConstraintInterface::set_pretty_string(&mut constraint, Some(pretty_version.clone())); + shirabe_semver::constraint::ConstraintInterface::set_pretty_string( + &mut constraint, + Some(pretty_version.clone()), + ); links[index] = new_link; } } diff --git a/crates/shirabe/src/package/archiver/archivable_files_finder.rs b/crates/shirabe/src/package/archiver/archivable_files_finder.rs index 72ffabf..2e06e4d 100644 --- a/crates/shirabe/src/package/archiver/archivable_files_finder.rs +++ b/crates/shirabe/src/package/archiver/archivable_files_finder.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Package/Archiver/ArchivableFilesFinder.php -use crate::package::archiver::composer_exclude_filter::ComposerExcludeFilter; -use crate::package::archiver::git_exclude_filter::GitExcludeFilter; -use crate::util::filesystem::Filesystem; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::finder::finder::Finder; -use shirabe_external_packages::symfony::component::finder::spl_file_info::SplFileInfo; +use crate::package::archiver::ComposerExcludeFilter; +use crate::package::archiver::GitExcludeFilter; +use crate::util::Filesystem; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::finder::Finder; +use shirabe_external_packages::symfony::component::finder::SplFileInfo; use shirabe_php_shim::{RuntimeException, preg_quote, realpath}; pub struct ArchivableFilesFinder { diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs index 094ddc3..390efc4 100644 --- a/crates/shirabe/src/package/archiver/archive_manager.rs +++ b/crates/shirabe/src/package/archiver/archive_manager.rs @@ -1,22 +1,22 @@ //! ref: composer/src/Composer/Package/Archiver/ArchiveManager.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, RuntimeException, bin2hex, file_exists, random_bytes, realpath, sys_get_temp_dir, }; -use crate::downloader::download_manager::DownloadManager; -use crate::json::json_file::JsonFile; -use crate::package::archiver::archiver_interface::ArchiverInterface; -use crate::package::archiver::phar_archiver::PharArchiver; -use crate::package::archiver::zip_archiver::ZipArchiver; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::util::filesystem::Filesystem; +use crate::downloader::DownloadManager; +use crate::json::JsonFile; +use crate::package::CompletePackageInterface; +use crate::package::RootPackageInterface; +use crate::package::archiver::ArchiverInterface; +use crate::package::archiver::PharArchiver; +use crate::package::archiver::ZipArchiver; +use crate::util::Filesystem; +use crate::util::SyncHelper; use crate::util::r#loop::Loop; -use crate::util::sync_helper::SyncHelper; pub struct ArchiveManager { pub(crate) download_manager: std::rc::Rc<std::cell::RefCell<DownloadManager>>, diff --git a/crates/shirabe/src/package/archiver/base_exclude_filter.rs b/crates/shirabe/src/package/archiver/base_exclude_filter.rs index 1a716d0..d3c0da1 100644 --- a/crates/shirabe/src/package/archiver/base_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/base_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/BaseExcludeFilter.php -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::finder::glob::Glob; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::finder::Glob; #[derive(Debug)] pub struct BaseExcludeFilterBase { diff --git a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs index 979e67e..e685a4a 100644 --- a/crates/shirabe/src/package/archiver/composer_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/composer_exclude_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Archiver/ComposerExcludeFilter.php -use super::base_exclude_filter::BaseExcludeFilterBase; +use super::BaseExcludeFilterBase; #[derive(Debug)] pub struct ComposerExcludeFilter { diff --git a/crates/shirabe/src/package/archiver/git_exclude_filter.rs b/crates/shirabe/src/package/archiver/git_exclude_filter.rs index 1a0ec4d..ffa349c 100644 --- a/crates/shirabe/src/package/archiver/git_exclude_filter.rs +++ b/crates/shirabe/src/package/archiver/git_exclude_filter.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Package/Archiver/GitExcludeFilter.php -use crate::package::archiver::base_exclude_filter::BaseExcludeFilterBase; -use shirabe_external_packages::composer::pcre::preg::Preg; +use crate::package::archiver::BaseExcludeFilterBase; +use shirabe_external_packages::composer::pcre::Preg; use std::path::Path; pub struct GitExcludeFilter { diff --git a/crates/shirabe/src/package/archiver/mod.rs b/crates/shirabe/src/package/archiver/mod.rs index ecf86c8..b4df5b0 100644 --- a/crates/shirabe/src/package/archiver/mod.rs +++ b/crates/shirabe/src/package/archiver/mod.rs @@ -7,3 +7,13 @@ pub mod composer_exclude_filter; pub mod git_exclude_filter; pub mod phar_archiver; pub mod zip_archiver; + +pub use archivable_files_filter::*; +pub use archivable_files_finder::*; +pub use archive_manager::*; +pub use archiver_interface::*; +pub use base_exclude_filter::*; +pub use composer_exclude_filter::*; +pub use git_exclude_filter::*; +pub use phar_archiver::*; +pub use zip_archiver::*; diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs index 17bc05b..bf5332a 100644 --- a/crates/shirabe/src/package/archiver/phar_archiver.rs +++ b/crates/shirabe/src/package/archiver/phar_archiver.rs @@ -6,9 +6,9 @@ use shirabe_php_shim::{ file_put_contents, function_exists, gzcompress, pack, str_repeat, strrpos, unlink, }; -use crate::package::archiver::archivable_files_filter::ArchivableFilesFilter; -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::archiver::archiver_interface::ArchiverInterface; +use crate::package::archiver::ArchivableFilesFilter; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::archiver::ArchiverInterface; fn formats() -> IndexMap<&'static str, i64> { let mut m = IndexMap::new(); diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs index a5dd4f4..79d714b 100644 --- a/crates/shirabe/src/package/archiver/zip_archiver.rs +++ b/crates/shirabe/src/package/archiver/zip_archiver.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Package/Archiver/ZipArchiver.php -use crate::package::archiver::archivable_files_finder::ArchivableFilesFinder; -use crate::package::archiver::archiver_interface::ArchiverInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::package::archiver::ArchivableFilesFinder; +use crate::package::archiver::ArchiverInterface; +use crate::util::Filesystem; +use crate::util::Platform; use indexmap::IndexMap; use shirabe_php_shim::{ PhpMixed, RuntimeException, ZipArchive, class_exists, fileperms, method_exists, pack, realpath, diff --git a/crates/shirabe/src/package/base_package.rs b/crates/shirabe/src/package/base_package.rs index 109fdb4..75bd22f 100644 --- a/crates/shirabe/src/package/base_package.rs +++ b/crates/shirabe/src/package/base_package.rs @@ -5,10 +5,10 @@ use std::sync::LazyLock; use indexmap::IndexMap; use shirabe_php_shim::{LogicException, UnexpectedValueException, preg_quote}; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; pub struct SupportedLinkType { pub description: &'static str, @@ -93,7 +93,7 @@ pub trait BasePackage: PackageInterface + std::fmt::Display { // as_alias_package / as_complete_package_interface inherited from PackageInterface. - fn as_alias_package_mut(&mut self) -> Option<&mut crate::package::alias_package::AliasPackage> { + fn as_alias_package_mut(&mut self) -> Option<&mut crate::package::AliasPackage> { None } diff --git a/crates/shirabe/src/package/comparer/comparer.rs b/crates/shirabe/src/package/comparer/comparer.rs index 8f406a5..73c94f4 100644 --- a/crates/shirabe/src/package/comparer/comparer.rs +++ b/crates/shirabe/src/package/comparer/comparer.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use std::path::Path; -use crate::util::platform::Platform; +use crate::util::Platform; #[derive(Debug)] pub struct Comparer { diff --git a/crates/shirabe/src/package/comparer/mod.rs b/crates/shirabe/src/package/comparer/mod.rs index 4c5c6d2..d6ce6cb 100644 --- a/crates/shirabe/src/package/comparer/mod.rs +++ b/crates/shirabe/src/package/comparer/mod.rs @@ -1 +1,3 @@ pub mod comparer; + +pub use comparer::*; diff --git a/crates/shirabe/src/package/complete_alias_package.rs b/crates/shirabe/src/package/complete_alias_package.rs index d187eea..530bd03 100644 --- a/crates/shirabe/src/package/complete_alias_package.rs +++ b/crates/shirabe/src/package/complete_alias_package.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/CompleteAliasPackage.php -use crate::package::alias_package::AliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; +use crate::package::AliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; #[derive(Debug)] pub struct CompleteAliasPackage { diff --git a/crates/shirabe/src/package/complete_package.rs b/crates/shirabe/src/package/complete_package.rs index f6ee7ae..dee84da 100644 --- a/crates/shirabe/src/package/complete_package.rs +++ b/crates/shirabe/src/package/complete_package.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/CompletePackage.php -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package::Package; -use crate::package::package_interface::PackageInterface; +use crate::package::CompletePackageInterface; +use crate::package::Package; +use crate::package::PackageInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; @@ -26,7 +26,7 @@ pub struct CompletePackage { impl CompletePackage { pub fn new(name: String, version: String, pretty_version: String) -> Self { Self { - inner: crate::package::package::Package::new(name, version, pretty_version), + inner: crate::package::Package::new(name, version, pretty_version), repositories: Vec::new(), license: Vec::new(), keywords: Vec::new(), @@ -273,23 +273,23 @@ impl PackageInterface for CompletePackage { todo!() } - fn get_requires(&self) -> IndexMap<String, super::link::Link> { + fn get_requires(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_conflicts(&self) -> IndexMap<String, super::link::Link> { + fn get_conflicts(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_provides(&self) -> IndexMap<String, super::link::Link> { + fn get_provides(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_replaces(&self) -> IndexMap<String, super::link::Link> { + fn get_replaces(&self) -> IndexMap<String, super::Link> { todo!() } - fn get_dev_requires(&self) -> IndexMap<String, super::link::Link> { + fn get_dev_requires(&self) -> IndexMap<String, super::Link> { todo!() } @@ -315,14 +315,12 @@ impl PackageInterface for CompletePackage { fn set_repository( &mut self, - repository: Box<dyn crate::repository::repository_interface::RepositoryInterface>, + repository: Box<dyn crate::repository::RepositoryInterface>, ) -> anyhow::Result<()> { todo!() } - fn get_repository( - &self, - ) -> Option<&dyn crate::repository::repository_interface::RepositoryInterface> { + fn get_repository(&self) -> Option<&dyn crate::repository::RepositoryInterface> { todo!() } diff --git a/crates/shirabe/src/package/complete_package_interface.rs b/crates/shirabe/src/package/complete_package_interface.rs index d1120ac..e638021 100644 --- a/crates/shirabe/src/package/complete_package_interface.rs +++ b/crates/shirabe/src/package/complete_package_interface.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub trait CompletePackageInterface: PackageInterface { fn get_scripts(&self) -> IndexMap<String, Vec<String>>; @@ -56,7 +56,7 @@ pub trait CompletePackageInterface: PackageInterface { fn set_archive_excludes(&mut self, excludes: Vec<String>); - fn as_package_interface(&self) -> &dyn crate::package::package_interface::PackageInterface { + fn as_package_interface(&self) -> &dyn crate::package::PackageInterface { todo!() } } diff --git a/crates/shirabe/src/package/dumper/array_dumper.rs b/crates/shirabe/src/package/dumper/array_dumper.rs index cbff605..4bd9b56 100644 --- a/crates/shirabe/src/package/dumper/array_dumper.rs +++ b/crates/shirabe/src/package/dumper/array_dumper.rs @@ -3,12 +3,12 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::base_package::SUPPORTED_LINK_TYPES; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::package::SUPPORTED_LINK_TYPES; #[derive(Debug)] pub struct ArrayDumper; @@ -133,7 +133,7 @@ impl ArrayDumper { // corresponds to: foreach (BasePackage::$supportedLinkTypes as $type => $opts) { $links = $package->{'get'.ucfirst($opts['method'])}(); ... } for (type_name, opts) in SUPPORTED_LINK_TYPES.iter() { // TODO(phase-b): PackageInterface needs get_links_by_method to mimic PHP magic call - let links: Vec<crate::package::link::Link> = Vec::new(); + let links: Vec<crate::package::Link> = Vec::new(); let _ = (&opts.method, package); if links.is_empty() { continue; diff --git a/crates/shirabe/src/package/dumper/mod.rs b/crates/shirabe/src/package/dumper/mod.rs index b50c878..c501aec 100644 --- a/crates/shirabe/src/package/dumper/mod.rs +++ b/crates/shirabe/src/package/dumper/mod.rs @@ -1 +1,3 @@ pub mod array_dumper; + +pub use array_dumper::*; diff --git a/crates/shirabe/src/package/link.rs b/crates/shirabe/src/package/link.rs index 2732075..80a98c7 100644 --- a/crates/shirabe/src/package/link.rs +++ b/crates/shirabe/src/package/link.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Package/Link.php use shirabe_php_shim::UnexpectedValueException; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; pub struct Link { pub(crate) source: String, diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 82b2ef7..ffbe465 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -3,23 +3,23 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ E_USER_DEPRECATED, Exception, LogicException, PhpMixed, UnexpectedValueException, is_scalar, is_string, json_encode, ltrim, sprintf, stripos, strpos, strtolower, strval, substr, trigger_error, trim, ucfirst, }; -use crate::package::base_package::{BasePackage, SUPPORTED_LINK_TYPES}; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package::RootPackage; -use crate::package::version::version_parser::VersionParser; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackage; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, SUPPORTED_LINK_TYPES}; #[derive(Debug)] pub struct ArrayLoader { diff --git a/crates/shirabe/src/package/loader/json_loader.rs b/crates/shirabe/src/package/loader/json_loader.rs index cb3cbeb..e0589bb 100644 --- a/crates/shirabe/src/package/loader/json_loader.rs +++ b/crates/shirabe/src/package/loader/json_loader.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Package/Loader/JsonLoader.php -use crate::json::json_file::JsonFile; -use crate::package::base_package::BasePackage; -use crate::package::loader::loader_interface::LoaderInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::loader::LoaderInterface; use anyhow::Result; use std::path::Path; diff --git a/crates/shirabe/src/package/loader/loader_interface.rs b/crates/shirabe/src/package/loader/loader_interface.rs index 2b93bc5..d10b7be 100644 --- a/crates/shirabe/src/package/loader/loader_interface.rs +++ b/crates/shirabe/src/package/loader/loader_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Loader/LoaderInterface.php -use crate::package::base_package::BasePackage; +use crate::package::BasePackage; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe/src/package/loader/mod.rs b/crates/shirabe/src/package/loader/mod.rs index 402b59c..1073172 100644 --- a/crates/shirabe/src/package/loader/mod.rs +++ b/crates/shirabe/src/package/loader/mod.rs @@ -4,3 +4,10 @@ pub mod json_loader; pub mod loader_interface; pub mod root_package_loader; pub mod validating_array_loader; + +pub use array_loader::*; +pub use invalid_package_exception::*; +pub use json_loader::*; +pub use loader_interface::*; +pub use root_package_loader::*; +pub use validating_array_loader::*; diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 15f1114..231c807 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -1,28 +1,28 @@ //! ref: composer/src/Composer/Package/Loader/RootPackageLoader.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ LogicException, RuntimeException, UnexpectedValueException, strtolower, ucfirst, }; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_factory::RepositoryFactory; -use crate::repository::repository_manager::RepositoryManager; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::loader::ValidatingArrayLoader; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::repository::RepositoryFactory; +use crate::repository::RepositoryManager; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RootPackageLoader { diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index f01b774..59fc266 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -3,24 +3,24 @@ use chrono::TimeZone; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; use shirabe_php_shim::{ E_USER_DEPRECATED, Exception, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key, array_values, filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string, json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, strtotime, substr, trigger_error, trim, var_export, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_none_constraint::MatchNoneConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchNoneConstraint; use shirabe_semver::intervals::Intervals; -use crate::package::base_package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; -use crate::package::loader::invalid_package_exception::InvalidPackageException; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; +use crate::package::loader::InvalidPackageException; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; +use crate::package::{BasePackage, STABILITIES, SUPPORTED_LINK_TYPES}; +use crate::repository::PlatformRepository; #[derive(Debug)] pub struct ValidatingArrayLoader { diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index 72339e8..5dd7ab4 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -3,8 +3,8 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::seld::json_lint::parsing_exception::ParsingException; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::seld::json_lint::ParsingException; use shirabe_php_shim::{ DATE_RFC3339, LogicException, PhpMixed, RuntimeException, array_intersect, array_keys, array_map, array_merge, call_user_func, file_get_contents, filemtime, function_exists, hash, @@ -12,27 +12,27 @@ use shirabe_php_shim::{ trim, usort, }; -use crate::installer::installation_manager::InstallationManager; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::link::Link; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; +use crate::installer::InstallationManager; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::CompleteAliasPackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionParser; use crate::plugin::plugin_interface::{self, PluginInterface}; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::FindPackageConstraint; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::git::Git as GitUtil; -use crate::util::process_executor::ProcessExecutor; +use crate::repository::FindPackageConstraint; +use crate::repository::InstalledRepository; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RootPackageRepository; +use crate::util::Git as GitUtil; +use crate::util::ProcessExecutor; /// Reads/writes project lockfile (composer.lock). #[derive(Debug)] diff --git a/crates/shirabe/src/package/mod.rs b/crates/shirabe/src/package/mod.rs index 77a01a2..611f36a 100644 --- a/crates/shirabe/src/package/mod.rs +++ b/crates/shirabe/src/package/mod.rs @@ -15,3 +15,21 @@ pub mod root_alias_package; pub mod root_package; pub mod root_package_interface; pub mod version; + +pub use alias_package::*; +pub use archiver::*; +pub use base_package::*; +pub use comparer::*; +pub use complete_alias_package::*; +pub use complete_package::*; +pub use complete_package_interface::*; +pub use dumper::*; +pub use link::*; +pub use loader::*; +pub use locker::*; +pub use package::*; +pub use package_interface::*; +pub use root_alias_package::*; +pub use root_package::*; +pub use root_package_interface::*; +pub use version::*; diff --git a/crates/shirabe/src/package/package.rs b/crates/shirabe/src/package/package.rs index b36de7a..75b4e54 100644 --- a/crates/shirabe/src/package/package.rs +++ b/crates/shirabe/src/package/package.rs @@ -3,15 +3,15 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::util::composer_mirror::ComposerMirror; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::util::ComposerMirror; use shirabe_php_shim::{E_USER_DEPRECATED, PhpMixed, strpos, trigger_error}; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::repository::RepositoryInterface; /// Mirror entry, e.g. `['url' => 'https://...', 'preferred' => true]`. #[derive(Debug, Clone)] diff --git a/crates/shirabe/src/package/package_interface.rs b/crates/shirabe/src/package/package_interface.rs index e6ffbed..1c9cf2e 100644 --- a/crates/shirabe/src/package/package_interface.rs +++ b/crates/shirabe/src/package/package_interface.rs @@ -4,8 +4,8 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::link::Link; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::Link; +use crate::repository::RepositoryInterface; /// Defines the essential information a package has that is used during solving/installation /// @@ -201,7 +201,7 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { fn get_suggests(&self) -> IndexMap<String, String>; /// PHP helper that switches on the link kind (require/require-dev/conflict/etc.). - fn get_links_for_type(&self, link_type: &str) -> IndexMap<String, crate::package::link::Link> { + fn get_links_for_type(&self, link_type: &str) -> IndexMap<String, crate::package::Link> { match link_type { "require" => self.get_requires(), "require-dev" => self.get_dev_requires(), @@ -298,25 +298,21 @@ pub trait PackageInterface: std::fmt::Display + std::fmt::Debug { todo!() } - fn as_alias_package(&self) -> Option<&crate::package::alias_package::AliasPackage> { + fn as_alias_package(&self) -> Option<&crate::package::AliasPackage> { None } fn as_complete_package_interface( &self, - ) -> Option<&dyn crate::package::complete_package_interface::CompletePackageInterface> { + ) -> Option<&dyn crate::package::CompletePackageInterface> { None } - fn as_complete_package( - &self, - ) -> Option<&dyn crate::package::complete_package_interface::CompletePackageInterface> { + fn as_complete_package(&self) -> Option<&dyn crate::package::CompletePackageInterface> { None } - fn as_root_package_interface( - &self, - ) -> Option<&dyn crate::package::root_package_interface::RootPackageInterface> { + fn as_root_package_interface(&self) -> Option<&dyn crate::package::RootPackageInterface> { None } } diff --git a/crates/shirabe/src/package/root_alias_package.rs b/crates/shirabe/src/package/root_alias_package.rs index cb458f3..d6dafa9 100644 --- a/crates/shirabe/src/package/root_alias_package.rs +++ b/crates/shirabe/src/package/root_alias_package.rs @@ -4,13 +4,13 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package::RootPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackage; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct RootAliasPackage { diff --git a/crates/shirabe/src/package/root_package.rs b/crates/shirabe/src/package/root_package.rs index af8d1f5..7e79530 100644 --- a/crates/shirabe/src/package/root_package.rs +++ b/crates/shirabe/src/package/root_package.rs @@ -4,12 +4,12 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct RootPackage { @@ -90,23 +90,23 @@ impl RootPackageInterface for RootPackage { &self.aliases } - fn set_requires(&mut self, requires: Vec<super::link::Link>) { + fn set_requires(&mut self, requires: Vec<super::Link>) { todo!() } - fn set_dev_requires(&mut self, dev_requires: Vec<super::link::Link>) { + fn set_dev_requires(&mut self, dev_requires: Vec<super::Link>) { todo!() } - fn set_conflicts(&mut self, conflicts: Vec<super::link::Link>) { + fn set_conflicts(&mut self, conflicts: Vec<super::Link>) { todo!() } - fn set_provides(&mut self, provides: Vec<super::link::Link>) { + fn set_provides(&mut self, provides: Vec<super::Link>) { todo!() } - fn set_replaces(&mut self, replaces: Vec<super::link::Link>) { + fn set_replaces(&mut self, replaces: Vec<super::Link>) { todo!() } diff --git a/crates/shirabe/src/package/root_package_interface.rs b/crates/shirabe/src/package/root_package_interface.rs index a053e28..2370e25 100644 --- a/crates/shirabe/src/package/root_package_interface.rs +++ b/crates/shirabe/src/package/root_package_interface.rs @@ -3,10 +3,10 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::link::Link; +use crate::package::CompletePackageInterface; +use crate::package::Link; pub trait RootPackageInterface: CompletePackageInterface { fn get_aliases(&self) -> &[IndexMap<String, String>]; diff --git a/crates/shirabe/src/package/version/mod.rs b/crates/shirabe/src/package/version/mod.rs index a734e23..b2f32a2 100644 --- a/crates/shirabe/src/package/version/mod.rs +++ b/crates/shirabe/src/package/version/mod.rs @@ -3,3 +3,9 @@ pub mod version_bumper; pub mod version_guesser; pub mod version_parser; pub mod version_selector; + +pub use stability_filter::*; +pub use version_bumper::*; +pub use version_guesser::*; +pub use version_parser::*; +pub use version_selector::*; diff --git a/crates/shirabe/src/package/version/stability_filter.rs b/crates/shirabe/src/package/version/stability_filter.rs index 5053e9d..da2f1a6 100644 --- a/crates/shirabe/src/package/version/stability_filter.rs +++ b/crates/shirabe/src/package/version/stability_filter.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Package/Version/StabilityFilter.php -use crate::package::base_package::STABILITIES; +use crate::package::STABILITIES; use indexmap::IndexMap; pub struct StabilityFilter; diff --git a/crates/shirabe/src/package/version/version_bumper.rs b/crates/shirabe/src/package/version/version_bumper.rs index f7c2377..a9b5a67 100644 --- a/crates/shirabe/src/package/version/version_bumper.rs +++ b/crates/shirabe/src/package/version/version_bumper.rs @@ -1,14 +1,14 @@ //! ref: composer/src/Composer/Package/Version/VersionBumper.php -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::util::platform::Platform; +use crate::package::PackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::intervals::Intervals; #[derive(Debug)] diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index c229c97..51a54e0 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -2,8 +2,8 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ PHP_INT_MAX, PhpMixed, RuntimeException, array_keys, array_map, array_merge, empty, function_exists, implode, is_string, json_encode, preg_quote, str_replace, strlen, @@ -12,15 +12,15 @@ use shirabe_php_shim::{ use shirabe_semver::version_parser::VersionParser as SemverVersionParser; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::version::version_parser::VersionParser; -use crate::repository::vcs::hg_driver::HgDriver; -use crate::util::git::Git as GitUtil; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::version::VersionParser; +use crate::repository::vcs::HgDriver; +use crate::util::Git as GitUtil; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; /// Try to guess the current version number based on different VCS configuration. /// @@ -518,8 +518,9 @@ impl VersionGuesser { strnatcasecmp(b, a) }); - let mut promises: Vec<Box<dyn shirabe_external_packages::react::promise::promise_interface::PromiseInterface>> = - vec![]; + let mut promises: Vec< + Box<dyn shirabe_external_packages::react::promise::PromiseInterface>, + > = vec![]; self.process.borrow_mut().set_max_jobs(30); // TODO(phase-b): try/finally with resetMaxJobs let result: Result<()> = (|| -> Result<()> { diff --git a/crates/shirabe/src/package/version/version_parser.rs b/crates/shirabe/src/package/version/version_parser.rs index 4286419..46a2356 100644 --- a/crates/shirabe/src/package/version/version_parser.rs +++ b/crates/shirabe/src/package/version/version_parser.rs @@ -3,12 +3,12 @@ use indexmap::IndexMap; use std::sync::{Arc, LazyLock, Mutex}; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_semver::constraint::ConstraintInterface; use shirabe_semver::semver::Semver; use shirabe_semver::version_parser::VersionParser as SemverVersionParser; -use crate::repository::platform_repository::PlatformRepository; +use crate::repository::PlatformRepository; static CONSTRAINTS: LazyLock<Mutex<IndexMap<String, Arc<dyn ConstraintInterface + Send + Sync>>>> = LazyLock::new(|| Mutex::new(IndexMap::new())); diff --git a/crates/shirabe/src/package/version/version_selector.rs b/crates/shirabe/src/package/version/version_selector.rs index 6496dea..832f64c 100644 --- a/crates/shirabe/src/package/version/version_selector.rs +++ b/crates/shirabe/src/package/version/version_selector.rs @@ -4,27 +4,27 @@ use crate::io::io_interface; use std::any::Any; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, strtolower, version_compare, }; -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::filter::platform_requirement_filter::ignore_all_platform_requirement_filter::IgnoreAllPlatformRequirementFilter; -use crate::filter::platform_requirement_filter::ignore_list_platform_requirement_filter::IgnoreListPlatformRequirementFilter; -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::package::alias_package::AliasPackage; +use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::IgnoreListPlatformRequirementFilter; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; +use crate::filter::platform_requirement_filter::PlatformRequirementFilterInterface; +use crate::io::IOInterface; +use crate::package::AliasPackage; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_set::RepositorySet; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::version::VersionParser; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySet; #[derive(Debug)] pub struct VersionSelector { @@ -36,7 +36,7 @@ pub struct VersionSelector { impl VersionSelector { pub fn new( repository_set: RepositorySet, - platform_repo: Option<&crate::repository::platform_repository::PlatformRepository>, + platform_repo: Option<&crate::repository::PlatformRepository>, ) -> anyhow::Result<Self> { let mut platform_constraints: IndexMap<String, Vec<Box<dyn ConstraintInterface>>> = IndexMap::new(); diff --git a/crates/shirabe/src/partial_composer.rs b/crates/shirabe/src/partial_composer.rs index 1ed7805..ec51b81 100644 --- a/crates/shirabe/src/partial_composer.rs +++ b/crates/shirabe/src/partial_composer.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/PartialComposer.php use crate::config::Config; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::installer::installation_manager::InstallationManager; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::repository_manager::RepositoryManager; +use crate::event_dispatcher::EventDispatcher; +use crate::installer::InstallationManager; +use crate::package::RootPackageInterface; +use crate::repository::RepositoryManager; use crate::util::r#loop::Loop; #[derive(Debug, Default)] diff --git a/crates/shirabe/src/phpstan/mod.rs b/crates/shirabe/src/phpstan/mod.rs index 5c48ac7..2893a48 100644 --- a/crates/shirabe/src/phpstan/mod.rs +++ b/crates/shirabe/src/phpstan/mod.rs @@ -1,2 +1,5 @@ pub mod config_return_type_extension; pub mod rule_reason_data_return_type_extension; + +pub use config_return_type_extension::*; +pub use rule_reason_data_return_type_extension::*; diff --git a/crates/shirabe/src/platform/hhvm_detector.rs b/crates/shirabe/src/platform/hhvm_detector.rs index 1fd3fee..736b4b2 100644 --- a/crates/shirabe/src/platform/hhvm_detector.rs +++ b/crates/shirabe/src/platform/hhvm_detector.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Platform/HhvmDetector.php -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use shirabe_external_packages::symfony::process::executable_finder::ExecutableFinder; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use shirabe_external_packages::symfony::process::ExecutableFinder; use shirabe_php_shim::{HHVM_VERSION, defined}; use std::sync::Mutex; diff --git a/crates/shirabe/src/platform/mod.rs b/crates/shirabe/src/platform/mod.rs index 35916e5..6abbb76 100644 --- a/crates/shirabe/src/platform/mod.rs +++ b/crates/shirabe/src/platform/mod.rs @@ -1,3 +1,7 @@ pub mod hhvm_detector; pub mod runtime; pub mod version; + +pub use hhvm_detector::*; +pub use runtime::*; +pub use version::*; diff --git a/crates/shirabe/src/platform/version.rs b/crates/shirabe/src/platform/version.rs index 2071d2a..e602f15 100644 --- a/crates/shirabe/src/platform/version.rs +++ b/crates/shirabe/src/platform/version.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Platform/Version.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::version_compare; pub struct Version; diff --git a/crates/shirabe/src/plugin/capability/command_provider.rs b/crates/shirabe/src/plugin/capability/command_provider.rs index f96c9e9..6d6f6cf 100644 --- a/crates/shirabe/src/plugin/capability/command_provider.rs +++ b/crates/shirabe/src/plugin/capability/command_provider.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Plugin/Capability/CommandProvider.php // TODO(plugin): Commands Provider Interface. Plugins implementing this capability provide a list of commands. -use crate::command::base_command::BaseCommand; -use crate::plugin::capability::capability::Capability; +use crate::command::BaseCommand; +use crate::plugin::capability::Capability; pub trait CommandProvider: Capability { fn get_commands(&self) -> Vec<Box<dyn BaseCommand>>; diff --git a/crates/shirabe/src/plugin/capability/mod.rs b/crates/shirabe/src/plugin/capability/mod.rs index c4a6f8b..d9874b4 100644 --- a/crates/shirabe/src/plugin/capability/mod.rs +++ b/crates/shirabe/src/plugin/capability/mod.rs @@ -1,2 +1,5 @@ pub mod capability; pub mod command_provider; + +pub use capability::*; +pub use command_provider::*; diff --git a/crates/shirabe/src/plugin/command_event.rs b/crates/shirabe/src/plugin/command_event.rs index f2a8417..bcfe256 100644 --- a/crates/shirabe/src/plugin/command_event.rs +++ b/crates/shirabe/src/plugin/command_event.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Plugin/CommandEvent.php -use crate::event_dispatcher::event::Event; +use crate::event_dispatcher::Event; 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; #[derive(Debug)] diff --git a/crates/shirabe/src/plugin/mod.rs b/crates/shirabe/src/plugin/mod.rs index 7ff98f3..a26e117 100644 --- a/crates/shirabe/src/plugin/mod.rs +++ b/crates/shirabe/src/plugin/mod.rs @@ -9,3 +9,15 @@ pub mod post_file_download_event; pub mod pre_command_run_event; pub mod pre_file_download_event; pub mod pre_pool_create_event; + +pub use capability::*; +pub use capable::*; +pub use command_event::*; +pub use plugin_blocked_exception::*; +pub use plugin_events::*; +pub use plugin_interface::*; +pub use plugin_manager::*; +pub use post_file_download_event::*; +pub use pre_command_run_event::*; +pub use pre_file_download_event::*; +pub use pre_pool_create_event::*; diff --git a/crates/shirabe/src/plugin/plugin_interface.rs b/crates/shirabe/src/plugin/plugin_interface.rs index d3083cc..875976f 100644 --- a/crates/shirabe/src/plugin/plugin_interface.rs +++ b/crates/shirabe/src/plugin/plugin_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Plugin/PluginInterface.php use crate::composer::Composer; -use crate::io::io_interface::IOInterface; -use crate::plugin::capable::Capable; +use crate::io::IOInterface; +use crate::plugin::Capable; pub const PLUGIN_API_VERSION: &'static str = "2.9.0"; diff --git a/crates/shirabe/src/plugin/plugin_manager.rs b/crates/shirabe/src/plugin/plugin_manager.rs index 840b6a9..a7d26c9 100644 --- a/crates/shirabe/src/plugin/plugin_manager.rs +++ b/crates/shirabe/src/plugin/plugin_manager.rs @@ -6,36 +6,36 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ E_USER_DEPRECATED, PhpMixed, RuntimeException, UnexpectedValueException, array_key_exists, array_reverse, array_search, clone, get_class, get_class_obj, implode, in_array, is_a, is_array, is_string, ksort, preg_quote, str_replace, strrpos, strtr, substr, trigger_error, trim, var_export, var_export_str, version_compare, }; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; use crate::composer::Composer; -use crate::event_dispatcher::event_subscriber_interface::EventSubscriberInterface; -use crate::installer::installer_interface::InstallerInterface; -use crate::io::io_interface::IOInterface; +use crate::event_dispatcher::EventSubscriberInterface; +use crate::installer::InstallerInterface; +use crate::io::IOInterface; +use crate::package::CompletePackage; +use crate::package::Link; +use crate::package::Locker; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::complete_package::CompletePackage; -use crate::package::link::Link; -use crate::package::locker::Locker; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; +use crate::package::version::VersionParser; use crate::partial_composer::PartialComposer; -use crate::plugin::capability::capability::Capability; -use crate::plugin::capable::Capable; -use crate::plugin::plugin_blocked_exception::PluginBlockedException; +use crate::plugin::Capable; +use crate::plugin::PluginBlockedException; +use crate::plugin::capability::Capability; use crate::plugin::plugin_interface::{self, PluginInterface}; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_utils::RepositoryUtils; -use crate::repository::root_package_repository::RootPackageRepository; -use crate::util::package_sorter::PackageSorter; +use crate::repository::InstalledRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositoryUtils; +use crate::repository::RootPackageRepository; +use crate::util::PackageSorter; /// Marker for the disablePlugins variant: false | "local" | "global" | true. #[derive(Debug, Clone, PartialEq)] @@ -195,7 +195,7 @@ impl PluginManager { if package.get_type() == "composer-plugin" { let requires_map = package.get_requires(); let mut requires_composer: Option< - &dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface, + &dyn shirabe_semver::constraint::ConstraintInterface, > = None; for (_k, link) in &requires_map { if "composer-plugin-api" == link.get_target() { @@ -501,7 +501,7 @@ impl PluginManager { // PHP: $requiredPackages = RepositoryUtils::filterRequiredPackages($packages, $rootPackage, true); // RepositoryUtils::filter_required_packages takes &[Box<dyn BasePackage>] plus a bucket. // We need to convert &[Box<dyn BasePackage>] from packages. - let bucket: Vec<Box<dyn crate::package::base_package::BasePackage>> = vec![]; + let bucket: Vec<Box<dyn crate::package::BasePackage>> = vec![]; RepositoryUtils::filter_required_packages( packages.as_slice(), root_package.unwrap(), diff --git a/crates/shirabe/src/plugin/post_file_download_event.rs b/crates/shirabe/src/plugin/post_file_download_event.rs index 549807a..46d52c0 100644 --- a/crates/shirabe/src/plugin/post_file_download_event.rs +++ b/crates/shirabe/src/plugin/post_file_download_event.rs @@ -2,7 +2,7 @@ use shirabe_php_shim::PhpMixed; -use crate::event_dispatcher::event::Event; +use crate::event_dispatcher::Event; #[derive(Debug)] pub struct PostFileDownloadEvent { diff --git a/crates/shirabe/src/plugin/pre_command_run_event.rs b/crates/shirabe/src/plugin/pre_command_run_event.rs index a3da4f7..2af2626 100644 --- a/crates/shirabe/src/plugin/pre_command_run_event.rs +++ b/crates/shirabe/src/plugin/pre_command_run_event.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Plugin/PreCommandRunEvent.php // TODO(plugin): this event is part of the plugin API and is dispatched before a command runs -use crate::event_dispatcher::event::Event; -use shirabe_external_packages::symfony::component::console::input::input_interface::InputInterface; +use crate::event_dispatcher::Event; +use shirabe_external_packages::symfony::component::console::input::InputInterface; #[derive(Debug)] pub struct PreCommandRunEvent { diff --git a/crates/shirabe/src/plugin/pre_file_download_event.rs b/crates/shirabe/src/plugin/pre_file_download_event.rs index 5fdfa6d..f6198b6 100644 --- a/crates/shirabe/src/plugin/pre_file_download_event.rs +++ b/crates/shirabe/src/plugin/pre_file_download_event.rs @@ -3,8 +3,8 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use crate::event_dispatcher::event::Event; -use crate::util::http_downloader::HttpDownloader; +use crate::event_dispatcher::Event; +use crate::util::HttpDownloader; #[derive(Debug)] pub struct PreFileDownloadEvent { diff --git a/crates/shirabe/src/plugin/pre_pool_create_event.rs b/crates/shirabe/src/plugin/pre_pool_create_event.rs index a1a6bc6..f4426f7 100644 --- a/crates/shirabe/src/plugin/pre_pool_create_event.rs +++ b/crates/shirabe/src/plugin/pre_pool_create_event.rs @@ -2,10 +2,10 @@ use indexmap::IndexMap; -use crate::dependency_resolver::request::Request; -use crate::event_dispatcher::event::Event; -use crate::package::base_package::BasePackage; -use crate::repository::repository_interface::RepositoryInterface; +use crate::dependency_resolver::Request; +use crate::event_dispatcher::Event; +use crate::package::BasePackage; +use crate::repository::RepositoryInterface; #[derive(Debug)] pub struct PrePoolCreateEvent { diff --git a/crates/shirabe/src/question/mod.rs b/crates/shirabe/src/question/mod.rs index fe17dc8..4fedd84 100644 --- a/crates/shirabe/src/question/mod.rs +++ b/crates/shirabe/src/question/mod.rs @@ -1 +1,3 @@ pub mod strict_confirmation_question; + +pub use strict_confirmation_question::*; diff --git a/crates/shirabe/src/question/strict_confirmation_question.rs b/crates/shirabe/src/question/strict_confirmation_question.rs index b3a7196..e291c56 100644 --- a/crates/shirabe/src/question/strict_confirmation_question.rs +++ b/crates/shirabe/src/question/strict_confirmation_question.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Question/StrictConfirmationQuestion.php use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::console::exception::invalid_argument_exception::InvalidArgumentException; -use shirabe_external_packages::symfony::console::question::question::Question; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::console::exception::InvalidArgumentException; +use shirabe_external_packages::symfony::console::question::Question; use shirabe_php_shim::{PhpMixed, empty, is_bool}; pub struct StrictConfirmationQuestion { diff --git a/crates/shirabe/src/repository/advisory_provider_interface.rs b/crates/shirabe/src/repository/advisory_provider_interface.rs index 9d627e5..4c08a63 100644 --- a/crates/shirabe/src/repository/advisory_provider_interface.rs +++ b/crates/shirabe/src/repository/advisory_provider_interface.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Repository/AdvisoryProviderInterface.php -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; -use crate::advisory::security_advisory::SecurityAdvisory; +use crate::advisory::PartialSecurityAdvisory; +use crate::advisory::SecurityAdvisory; use indexmap::IndexMap; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub enum PartialOrSecurityAdvisory { diff --git a/crates/shirabe/src/repository/array_repository.rs b/crates/shirabe/src/repository/array_repository.rs index c8a465e..f8d2e0c 100644 --- a/crates/shirabe/src/repository/array_repository.rs +++ b/crates/shirabe/src/repository/array_repository.rs @@ -5,23 +5,23 @@ use std::cell::RefCell; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ Countable, InvalidArgumentException, LogicException, implode, preg_quote, spl_object_hash, strtolower, }; -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::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::version::stability_filter::StabilityFilter; -use crate::package::version::version_parser::VersionParser; -use crate::repository::repository_interface::{ +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; +use crate::package::version::StabilityFilter; +use crate::package::version::VersionParser; +use crate::repository::{ AbandonedInfo, FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; @@ -222,7 +222,7 @@ impl RepositoryInterface for ArrayRepository { LoadPackagesResult { names_found: names_found.into_keys().collect(), - packages: result.into_values().collect(), + packages: result, } } @@ -288,7 +288,7 @@ impl RepositoryInterface for ArrayRepository { } fn search(&self, query: String, mode: i64, r#type: Option<String>) -> Vec<SearchResult> { - let regex = if mode == crate::repository::repository_interface::SEARCH_FULLTEXT { + let regex = if mode == crate::repository::SEARCH_FULLTEXT { let parts = Preg::split("{\\s+}", &preg_quote(&query, None)).unwrap_or_default(); format!("{{(?:{})}}i", implode("|", &parts)) } else { @@ -300,7 +300,7 @@ impl RepositoryInterface for ArrayRepository { let mut matches: IndexMap<String, SearchResult> = IndexMap::new(); for package in self.get_packages() { let mut name = PackageInterface::get_name(package.as_ref()).to_string(); - if mode == crate::repository::repository_interface::SEARCH_VENDOR { + if mode == crate::repository::SEARCH_VENDOR { // PHP: [$name] = explode('/', $name); let parts: Vec<&str> = name.splitn(2, '/').collect(); name = parts[0].to_string(); @@ -316,7 +316,7 @@ impl RepositoryInterface for ArrayRepository { let complete = package.as_any().downcast_ref::<CompletePackage>(); - let fulltext_match = mode == crate::repository::repository_interface::SEARCH_FULLTEXT + let fulltext_match = mode == crate::repository::SEARCH_FULLTEXT && complete.is_some() && Preg::is_match( ®ex, @@ -329,7 +329,7 @@ impl RepositoryInterface for ArrayRepository { .unwrap_or(false); if Preg::is_match(®ex, &name).unwrap_or(false) || fulltext_match { - if mode == crate::repository::repository_interface::SEARCH_VENDOR { + if mode == crate::repository::SEARCH_VENDOR { matches.insert( name.clone(), SearchResult { diff --git a/crates/shirabe/src/repository/artifact_repository.rs b/crates/shirabe/src/repository/artifact_repository.rs index 2ca7420..674325d 100644 --- a/crates/shirabe/src/repository/artifact_repository.rs +++ b/crates/shirabe/src/repository/artifact_repository.rs @@ -8,16 +8,16 @@ use shirabe_php_shim::{ PhpMixed, RuntimeException, UnexpectedValueException, extension_loaded, hash_file, }; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::base_package::BasePackage; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::configurable_repository_interface::ConfigurableRepositoryInterface; -use crate::util::platform::Platform; -use crate::util::tar::Tar; -use crate::util::zip::Zip; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::repository::ArrayRepository; +use crate::repository::ConfigurableRepositoryInterface; +use crate::util::Platform; +use crate::util::Tar; +use crate::util::Zip; pub struct ArtifactRepository { inner: ArrayRepository, diff --git a/crates/shirabe/src/repository/canonical_packages_trait.rs b/crates/shirabe/src/repository/canonical_packages_trait.rs index 3c9c75c..8c6e7c2 100644 --- a/crates/shirabe/src/repository/canonical_packages_trait.rs +++ b/crates/shirabe/src/repository/canonical_packages_trait.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Repository/CanonicalPackagesTrait.php -use crate::package::package_interface::PackageInterface; +use crate::package::PackageInterface; use indexmap::IndexMap; /// Provides get_canonical_packages() to various repository implementations. diff --git a/crates/shirabe/src/repository/composer_repository.rs b/crates/shirabe/src/repository/composer_repository.rs index ac6e834..772cedc 100644 --- a/crates/shirabe/src/repository/composer_repository.rs +++ b/crates/shirabe/src/repository/composer_repository.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Repository/ComposerRepository.php use indexmap::IndexMap; -use shirabe_external_packages::composer::metadata_minifier::metadata_minifier::MetadataMinifier; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::composer::metadata_minifier::MetadataMinifier; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ Countable, InvalidArgumentException, JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, LogicException, PHP_EOL, PhpMixed, RuntimeException, UnexpectedValueException, @@ -12,37 +12,37 @@ use shirabe_php_shim::{ }; use shirabe_semver::compiling_matcher::CompilingMatcher; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; +use crate::advisory::PartialSecurityAdvisory; use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::package_interface::PackageInterface; -use crate::package::version::stability_filter::StabilityFilter; -use crate::package::version::version_parser::VersionParser; -use crate::plugin::plugin_events::PluginEvents; -use crate::plugin::post_file_download_event::PostFileDownloadEvent; -use crate::plugin::pre_file_download_event::PreFileDownloadEvent; -use crate::repository::advisory_provider_interface::{ - PartialOrSecurityAdvisory, SecurityAdvisoryResult, -}; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::configurable_repository_interface::ConfigurableRepositoryInterface; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_security_exception::RepositorySecurityException; -use crate::util::http::response::Response; -use crate::util::http_downloader::HttpDownloader; +use crate::package::loader::ArrayLoader; +use crate::package::version::StabilityFilter; +use crate::package::version::VersionParser; +use crate::plugin::PluginEvents; +use crate::plugin::PostFileDownloadEvent; +use crate::plugin::PreFileDownloadEvent; +use crate::repository::ArrayRepository; +use crate::repository::ConfigurableRepositoryInterface; +use crate::repository::LoadPackagesResult; +use crate::repository::PlatformRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositorySecurityException; +use crate::repository::{PartialOrSecurityAdvisory, SecurityAdvisoryResult}; +use crate::repository::{SEARCH_FULLTEXT, SEARCH_VENDOR}; +use crate::util::HttpDownloader; +use crate::util::Url; +use crate::util::http::Response; use crate::util::r#loop::Loop; -use crate::util::url::Url; #[derive(Debug)] pub enum RootData { @@ -126,12 +126,6 @@ pub enum FindPackageReturn { } #[derive(Debug)] -pub struct LoadPackagesResult { - pub names_found: Vec<String>, - pub packages: IndexMap<String, Box<dyn BasePackage>>, -} - -#[derive(Debug)] pub struct LoadAsyncPackagesResult { pub names_found: IndexMap<String, bool>, pub packages: IndexMap<String, Box<dyn BasePackage>>, @@ -394,7 +388,7 @@ impl ComposerRepository { Ok(self.inner.find_package( &name, - crate::repository::repository_interface::FindPackageConstraint::Constraint(constraint), + crate::repository::FindPackageConstraint::Constraint(constraint), )) } @@ -464,8 +458,7 @@ impl ComposerRepository { Ok(self.inner.find_packages( &name, - constraint - .map(crate::repository::repository_interface::FindPackageConstraint::Constraint), + constraint.map(crate::repository::FindPackageConstraint::Constraint), )) } @@ -3598,9 +3591,6 @@ impl ComposerRepository { } } -pub const SEARCH_FULLTEXT: i64 = 0; -pub const SEARCH_VENDOR: i64 = 2; - #[derive(Debug)] enum FetchFileIfLastModifiedResult { NotModified, diff --git a/crates/shirabe/src/repository/composite_repository.rs b/crates/shirabe/src/repository/composite_repository.rs index 2c26469..b3ac1dd 100644 --- a/crates/shirabe/src/repository/composite_repository.rs +++ b/crates/shirabe/src/repository/composite_repository.rs @@ -3,11 +3,11 @@ use std::any::Any; use indexmap::IndexMap; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::repository_interface::{ +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; @@ -116,7 +116,7 @@ impl RepositoryInterface for CompositeRepository { stability_flags: IndexMap<String, i64>, already_loaded: IndexMap<String, IndexMap<String, Box<dyn PackageInterface>>>, ) -> LoadPackagesResult { - let mut all_packages = vec![]; + let mut all_packages = IndexMap::new(); let mut all_names_found = vec![]; for repository in &self.repositories { diff --git a/crates/shirabe/src/repository/filesystem_repository.rs b/crates/shirabe/src/repository/filesystem_repository.rs index f30e401..96c7b61 100644 --- a/crates/shirabe/src/repository/filesystem_repository.rs +++ b/crates/shirabe/src/repository/filesystem_repository.rs @@ -2,10 +2,10 @@ use std::any::Any; -use crate::util::silencer::Silencer; +use crate::util::Silencer; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ Exception, InvalidArgumentException, LogicException, PhpMixed, SORT_NATURAL, UnexpectedValueException, array_flip, dirname, r#eval, file_get_contents, get_class, @@ -14,20 +14,20 @@ use shirabe_php_shim::{ }; use crate::installed_versions::InstalledVersions; -use crate::installer::installation_manager::InstallationManager; -use crate::json::json_file::JsonFile; -use crate::package::alias_package::AliasPackage; -use crate::package::dumper::array_dumper::ArrayDumper; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::package_interface::PackageInterface; -use crate::package::root_alias_package::RootAliasPackage; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::invalid_repository_exception::InvalidRepositoryException; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::writable_array_repository::WritableArrayRepository; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; +use crate::installer::InstallationManager; +use crate::json::JsonFile; +use crate::package::AliasPackage; +use crate::package::PackageInterface; +use crate::package::RootAliasPackage; +use crate::package::RootPackageInterface; +use crate::package::dumper::ArrayDumper; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::repository::InvalidRepositoryException; +use crate::repository::PlatformRepository; +use crate::repository::WritableArrayRepository; +use crate::util::Filesystem; +use crate::util::Platform; /// Filesystem repository. #[derive(Debug)] diff --git a/crates/shirabe/src/repository/filter_repository.rs b/crates/shirabe/src/repository/filter_repository.rs index 482ffbe..8a0e6f6 100644 --- a/crates/shirabe/src/repository/filter_repository.rs +++ b/crates/shirabe/src/repository/filter_repository.rs @@ -1,18 +1,16 @@ //! ref: composer/src/Composer/Repository/FilterRepository.php +use crate::package::PackageInterface; use crate::package::base_package::{self, BasePackage}; -use crate::package::package_interface::PackageInterface; -use crate::repository::advisory_provider_interface::{ - AdvisoryProviderInterface, SecurityAdvisoryResult, -}; -use crate::repository::repository_interface::{ +use crate::repository::{AdvisoryProviderInterface, SecurityAdvisoryResult}; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{InvalidArgumentException, PhpMixed}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct FilterRepository { @@ -199,7 +197,7 @@ impl RepositoryInterface for FilterRepository { if package_name_map.is_empty() { return LoadPackagesResult { names_found: Vec::new(), - packages: Vec::new(), + packages: IndexMap::new(), }; } diff --git a/crates/shirabe/src/repository/installed_array_repository.rs b/crates/shirabe/src/repository/installed_array_repository.rs index ddcda90..fd273b9 100644 --- a/crates/shirabe/src/repository/installed_array_repository.rs +++ b/crates/shirabe/src/repository/installed_array_repository.rs @@ -2,17 +2,17 @@ use indexmap::IndexMap; use shirabe_php_shim::Countable; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::advisory_provider_interface::AdvisoryProviderInterface; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::repository_interface::{ +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::repository::AdvisoryProviderInterface; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::WritableArrayRepository; +use crate::repository::WritableRepositoryInterface; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; -use crate::repository::writable_array_repository::WritableArrayRepository; -use crate::repository::writable_repository_interface::WritableRepositoryInterface; #[derive(Debug)] pub struct InstalledArrayRepository { @@ -49,28 +49,26 @@ impl WritableRepositoryInterface for InstalledArrayRepository { fn write( &mut self, dev_mode: bool, - installation_manager: &crate::installer::installation_manager::InstallationManager, + installation_manager: &crate::installer::InstallationManager, ) -> anyhow::Result<()> { todo!() } fn add_package( &mut self, - package: Box<dyn crate::package::package_interface::PackageInterface>, + package: Box<dyn crate::package::PackageInterface>, ) -> anyhow::Result<()> { todo!() } fn remove_package( &mut self, - package: &dyn crate::package::package_interface::PackageInterface, + package: &dyn crate::package::PackageInterface, ) -> anyhow::Result<()> { todo!() } - fn get_canonical_packages( - &self, - ) -> Vec<Box<dyn crate::package::package_interface::PackageInterface>> { + fn get_canonical_packages(&self) -> Vec<Box<dyn crate::package::PackageInterface>> { todo!() } diff --git a/crates/shirabe/src/repository/installed_filesystem_repository.rs b/crates/shirabe/src/repository/installed_filesystem_repository.rs index c7f2a4d..db1428a 100644 --- a/crates/shirabe/src/repository/installed_filesystem_repository.rs +++ b/crates/shirabe/src/repository/installed_filesystem_repository.rs @@ -3,20 +3,20 @@ use anyhow::Result; use indexmap::IndexMap; use shirabe_php_shim::Countable; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; -use crate::json::json_file::JsonFile; -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::advisory_provider_interface::AdvisoryProviderInterface; -use crate::repository::filesystem_repository::FilesystemRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::repository_interface::{ +use crate::json::JsonFile; +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::AdvisoryProviderInterface; +use crate::repository::FilesystemRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::WritableRepositoryInterface; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; -use crate::repository::writable_repository_interface::WritableRepositoryInterface; -use crate::util::filesystem::Filesystem; +use crate::util::Filesystem; #[derive(Debug)] pub struct InstalledFilesystemRepository { @@ -59,28 +59,26 @@ impl WritableRepositoryInterface for InstalledFilesystemRepository { fn write( &mut self, dev_mode: bool, - installation_manager: &crate::installer::installation_manager::InstallationManager, + installation_manager: &crate::installer::InstallationManager, ) -> anyhow::Result<()> { todo!() } fn add_package( &mut self, - package: Box<dyn crate::package::package_interface::PackageInterface>, + package: Box<dyn crate::package::PackageInterface>, ) -> anyhow::Result<()> { todo!() } fn remove_package( &mut self, - package: &dyn crate::package::package_interface::PackageInterface, + package: &dyn crate::package::PackageInterface, ) -> anyhow::Result<()> { todo!() } - fn get_canonical_packages( - &self, - ) -> Vec<Box<dyn crate::package::package_interface::PackageInterface>> { + fn get_canonical_packages(&self) -> Vec<Box<dyn crate::package::PackageInterface>> { todo!() } diff --git a/crates/shirabe/src/repository/installed_repository.rs b/crates/shirabe/src/repository/installed_repository.rs index 6091b15..3163ed2 100644 --- a/crates/shirabe/src/repository/installed_repository.rs +++ b/crates/shirabe/src/repository/installed_repository.rs @@ -2,23 +2,23 @@ use indexmap::IndexMap; use shirabe_php_shim::LogicException; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; -use crate::package::base_package::BasePackage; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::package::version::version_parser::VersionParser; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::{ +use crate::package::BasePackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::package::version::VersionParser; +use crate::repository::CompositeRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::RootPackageRepository; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; -use crate::repository::root_package_repository::RootPackageRepository; pub enum NeedleInput { Single(String), diff --git a/crates/shirabe/src/repository/installed_repository_interface.rs b/crates/shirabe/src/repository/installed_repository_interface.rs index 80efef9..201870c 100644 --- a/crates/shirabe/src/repository/installed_repository_interface.rs +++ b/crates/shirabe/src/repository/installed_repository_interface.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Repository/InstalledRepositoryInterface.php -use crate::repository::writable_repository_interface::WritableRepositoryInterface; +use crate::repository::WritableRepositoryInterface; pub trait InstalledRepositoryInterface: WritableRepositoryInterface { fn get_dev_mode(&self) -> Option<bool>; diff --git a/crates/shirabe/src/repository/lock_array_repository.rs b/crates/shirabe/src/repository/lock_array_repository.rs index 87acf6e..295d982 100644 --- a/crates/shirabe/src/repository/lock_array_repository.rs +++ b/crates/shirabe/src/repository/lock_array_repository.rs @@ -1,15 +1,15 @@ //! ref: composer/src/Composer/Repository/LockArrayRepository.php -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::canonical_packages_trait::CanonicalPackagesTrait; -use crate::repository::repository_interface::{ +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::repository::ArrayRepository; +use crate::repository::CanonicalPackagesTrait; +use crate::repository::{ FindPackageConstraint, LoadPackagesResult, ProviderInfo, RepositoryInterface, SearchResult, }; use indexmap::IndexMap; use shirabe_php_shim::Countable; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct LockArrayRepository { diff --git a/crates/shirabe/src/repository/mod.rs b/crates/shirabe/src/repository/mod.rs index e570051..6f037d0 100644 --- a/crates/shirabe/src/repository/mod.rs +++ b/crates/shirabe/src/repository/mod.rs @@ -29,3 +29,35 @@ pub mod vcs_repository; pub mod version_cache_interface; pub mod writable_array_repository; pub mod writable_repository_interface; + +pub use advisory_provider_interface::*; +pub use array_repository::*; +pub use artifact_repository::*; +pub use canonical_packages_trait::*; +pub use composer_repository::*; +pub use composite_repository::*; +pub use configurable_repository_interface::*; +pub use filesystem_repository::*; +pub use filter_repository::*; +pub use installed_array_repository::*; +pub use installed_filesystem_repository::*; +pub use installed_repository::*; +pub use installed_repository_interface::*; +pub use invalid_repository_exception::*; +pub use lock_array_repository::*; +pub use package_repository::*; +pub use path_repository::*; +pub use pear_repository::*; +pub use platform_repository::*; +pub use repository_factory::*; +pub use repository_interface::*; +pub use repository_manager::*; +pub use repository_security_exception::*; +pub use repository_set::*; +pub use repository_utils::*; +pub use root_package_repository::*; +pub use vcs::*; +pub use vcs_repository::*; +pub use version_cache_interface::*; +pub use writable_array_repository::*; +pub use writable_repository_interface::*; diff --git a/crates/shirabe/src/repository/package_repository.rs b/crates/shirabe/src/repository/package_repository.rs index dc8a8f3..6e8186c 100644 --- a/crates/shirabe/src/repository/package_repository.rs +++ b/crates/shirabe/src/repository/package_repository.rs @@ -1,19 +1,19 @@ //! ref: composer/src/Composer/Repository/PackageRepository.php -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; -use crate::advisory::security_advisory::SecurityAdvisory; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; -use crate::package::version::version_parser::VersionParser; -use crate::repository::advisory_provider_interface::{ +use crate::advisory::PartialSecurityAdvisory; +use crate::advisory::SecurityAdvisory; +use crate::package::loader::ArrayLoader; +use crate::package::loader::ValidatingArrayLoader; +use crate::package::version::VersionParser; +use crate::repository::ArrayRepository; +use crate::repository::InvalidRepositoryException; +use crate::repository::{ AdvisoryProviderInterface, PartialOrSecurityAdvisory, SecurityAdvisoryResult, }; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::invalid_repository_exception::InvalidRepositoryException; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{Exception, PhpMixed, RuntimeException, var_export}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; #[derive(Debug)] pub struct PackageRepository { @@ -78,7 +78,7 @@ impl PackageRepository { } pub fn get_repo_name(&self) -> String { - use crate::repository::repository_interface::RepositoryInterface; + use crate::repository::RepositoryInterface; Preg::replace(r"^array ", "package ", &self.inner.get_repo_name()) .unwrap_or_else(|_| self.inner.get_repo_name()) } diff --git a/crates/shirabe/src/repository/path_repository.rs b/crates/shirabe/src/repository/path_repository.rs index 620bff8..7d37951 100644 --- a/crates/shirabe/src/repository/path_repository.rs +++ b/crates/shirabe/src/repository/path_repository.rs @@ -1,28 +1,28 @@ //! ref: composer/src/Composer/Repository/PathRepository.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, GLOB_BRACE, GLOB_MARK, GLOB_ONLYDIR, PhpMixed, RuntimeException, defined, file_exists, file_get_contents, glob_with_flags, hash, realpath, serialize, }; use crate::config::Config; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::version::version_guesser::VersionGuesser; -use crate::package::version::version_parser::VersionParser; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::configurable_repository_interface::ConfigurableRepositoryInterface; -use crate::util::filesystem::Filesystem; -use crate::util::git::Git as GitUtil; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::package::loader::ArrayLoader; +use crate::package::loader::LoaderInterface; +use crate::package::version::VersionGuesser; +use crate::package::version::VersionParser; +use crate::repository::ArrayRepository; +use crate::repository::ConfigurableRepositoryInterface; +use crate::util::Filesystem; +use crate::util::Git as GitUtil; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url; #[derive(Debug)] pub struct PathRepository { diff --git a/crates/shirabe/src/repository/pear_repository.rs b/crates/shirabe/src/repository/pear_repository.rs index 6ee4db7..1f0e29e 100644 --- a/crates/shirabe/src/repository/pear_repository.rs +++ b/crates/shirabe/src/repository/pear_repository.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Repository/PearRepository.php -use super::array_repository::ArrayRepository; +use super::ArrayRepository; use shirabe_php_shim::InvalidArgumentException; #[derive(Debug)] diff --git a/crates/shirabe/src/repository/platform_repository.rs b/crates/shirabe/src/repository/platform_repository.rs index 79c06fe..17fde5d 100644 --- a/crates/shirabe/src/repository/platform_repository.rs +++ b/crates/shirabe/src/repository/platform_repository.rs @@ -4,28 +4,28 @@ use std::sync::{LazyLock, Mutex}; 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::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, UnexpectedValueException, array_map_str_fn, array_slice, array_slice_strs, explode, get_class, implode, in_array, is_string, sprintf, str_replace, str_starts_with, strpos, strtolower, var_export, }; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; use crate::composer::Composer; -use crate::package::complete_package::CompletePackage; -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::platform::hhvm_detector::HhvmDetector; -use crate::platform::runtime::Runtime; -use crate::platform::version::Version; +use crate::package::CompletePackage; +use crate::package::CompletePackageInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::version::VersionParser; +use crate::platform::HhvmDetector; +use crate::platform::Runtime; +use crate::platform::Version; use crate::plugin::plugin_interface::{self, PluginInterface}; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::util::silencer::Silencer; +use crate::repository::ArrayRepository; +use crate::repository::RepositoryInterface; +use crate::util::Silencer; static LAST_SEEN_PLATFORM_PHP: LazyLock<Mutex<Option<String>>> = LazyLock::new(|| Mutex::new(None)); @@ -1609,9 +1609,7 @@ impl PlatformRepository { let overrider = self.inner.find_package( package.get_name(), - crate::repository::repository_interface::FindPackageConstraint::String( - "*".to_string(), - ), + crate::repository::FindPackageConstraint::String("*".to_string()), ); let actual_text = if let Some(ref ov) = overrider { if package.get_version() == ov.get_version() { @@ -1879,9 +1877,9 @@ impl PlatformRepository { query: String, mode: i64, r#type: Option<String>, - ) -> Vec<crate::repository::repository_interface::SearchResult> { + ) -> Vec<crate::repository::SearchResult> { // suppress vendor search as there are no vendors to match in platform packages - if mode == crate::repository::repository_interface::SEARCH_VENDOR { + if mode == crate::repository::SEARCH_VENDOR { return Vec::new(); } @@ -1936,7 +1934,7 @@ impl shirabe_php_shim::Countable for PlatformRepository { } } -impl crate::repository::repository_interface::RepositoryInterface for PlatformRepository { +impl crate::repository::RepositoryInterface for PlatformRepository { fn has_package(&self, package: &dyn PackageInterface) -> bool { self.inner.has_package(package) } @@ -1944,20 +1942,20 @@ impl crate::repository::repository_interface::RepositoryInterface for PlatformRe fn find_package( &self, name: &str, - constraint: crate::repository::repository_interface::FindPackageConstraint, - ) -> Option<Box<dyn crate::package::base_package::BasePackage>> { + constraint: crate::repository::FindPackageConstraint, + ) -> Option<Box<dyn crate::package::BasePackage>> { self.inner.find_package(name, constraint) } fn find_packages( &self, name: &str, - constraint: Option<crate::repository::repository_interface::FindPackageConstraint>, - ) -> Vec<Box<dyn crate::package::base_package::BasePackage>> { + constraint: Option<crate::repository::FindPackageConstraint>, + ) -> Vec<Box<dyn crate::package::BasePackage>> { self.inner.find_packages(name, constraint) } - fn get_packages(&self) -> Vec<Box<dyn crate::package::base_package::BasePackage>> { + fn get_packages(&self) -> Vec<Box<dyn crate::package::BasePackage>> { self.inner.get_packages() } @@ -1965,12 +1963,12 @@ impl crate::repository::repository_interface::RepositoryInterface for PlatformRe &self, package_name_map: IndexMap< String, - Option<Box<dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface>>, + Option<Box<dyn shirabe_semver::constraint::ConstraintInterface>>, >, acceptable_stabilities: IndexMap<String, i64>, stability_flags: IndexMap<String, i64>, already_loaded: IndexMap<String, IndexMap<String, Box<dyn PackageInterface>>>, - ) -> crate::repository::repository_interface::LoadPackagesResult { + ) -> crate::repository::LoadPackagesResult { self.inner.load_packages( package_name_map, acceptable_stabilities, @@ -1984,14 +1982,14 @@ impl crate::repository::repository_interface::RepositoryInterface for PlatformRe query: String, mode: i64, r#type: Option<String>, - ) -> Vec<crate::repository::repository_interface::SearchResult> { + ) -> Vec<crate::repository::SearchResult> { self.inner.search(query, mode, r#type) } fn get_providers( &self, package_name: String, - ) -> IndexMap<String, crate::repository::repository_interface::ProviderInfo> { + ) -> IndexMap<String, crate::repository::ProviderInfo> { self.inner.get_providers(package_name) } diff --git a/crates/shirabe/src/repository/repository_factory.rs b/crates/shirabe/src/repository/repository_factory.rs index 614166c..38e436b 100644 --- a/crates/shirabe/src/repository/repository_factory.rs +++ b/crates/shirabe/src/repository/repository_factory.rs @@ -1,21 +1,21 @@ //! ref: composer/src/Composer/Repository/RepositoryFactory.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, UnexpectedValueException, get_debug_type, json_encode, }; use crate::config::Config; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; +use crate::event_dispatcher::EventDispatcher; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::filesystem_repository::FilesystemRepository; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::repository_manager::RepositoryManager; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::FilesystemRepository; +use crate::repository::RepositoryInterface; +use crate::repository::RepositoryManager; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; pub struct RepositoryFactory; diff --git a/crates/shirabe/src/repository/repository_interface.rs b/crates/shirabe/src/repository/repository_interface.rs index de37b5f..d18951b 100644 --- a/crates/shirabe/src/repository/repository_interface.rs +++ b/crates/shirabe/src/repository/repository_interface.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Repository/RepositoryInterface.php -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::repository::advisory_provider_interface::AdvisoryProviderInterface; +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::repository::AdvisoryProviderInterface; use indexmap::IndexMap; use shirabe_php_shim::Countable; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; pub enum FindPackageConstraint { String(String), @@ -21,9 +21,10 @@ impl Clone for FindPackageConstraint { } } +#[derive(Debug)] pub struct LoadPackagesResult { pub names_found: Vec<String>, - pub packages: Vec<Box<dyn BasePackage>>, + pub packages: IndexMap<String, Box<dyn BasePackage>>, } #[derive(Debug, Clone)] @@ -88,8 +89,7 @@ pub trait RepositoryInterface: Countable + std::fmt::Debug { fn as_installed_repository_interface( &self, - ) -> Option<&dyn crate::repository::installed_repository_interface::InstalledRepositoryInterface> - { + ) -> Option<&dyn crate::repository::InstalledRepositoryInterface> { None } diff --git a/crates/shirabe/src/repository/repository_manager.rs b/crates/shirabe/src/repository/repository_manager.rs index b697949..10e3e37 100644 --- a/crates/shirabe/src/repository/repository_manager.rs +++ b/crates/shirabe/src/repository/repository_manager.rs @@ -2,17 +2,17 @@ use indexmap::IndexMap; use shirabe_php_shim::{InvalidArgumentException, PhpMixed, json_encode}; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; +use shirabe_semver::constraint::ConstraintInterface; use crate::config::Config; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::package_interface::PackageInterface; -use crate::repository::filter_repository::FilterRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::repository_interface::RepositoryInterface; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::PackageInterface; +use crate::repository::FilterRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::RepositoryInterface; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RepositoryManager { @@ -56,9 +56,7 @@ impl RepositoryManager { for repository in &self.repositories { if let Some(package) = repository.find_package( name, - crate::repository::repository_interface::FindPackageConstraint::Constraint( - constraint.clone_box(), - ), + crate::repository::FindPackageConstraint::Constraint(constraint.clone_box()), ) { return Some(package.clone_package_box()); } @@ -75,11 +73,9 @@ impl RepositoryManager { for repository in self.get_repositories() { for p in repository.find_packages( name, - Some( - crate::repository::repository_interface::FindPackageConstraint::Constraint( - constraint.clone_box(), - ), - ), + Some(crate::repository::FindPackageConstraint::Constraint( + constraint.clone_box(), + )), ) { packages.push(p.clone_package_box()); } diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index f39840b..84b2424 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -8,37 +8,35 @@ use shirabe_php_shim::{ LogicException, PhpMixed, RuntimeException, array_merge, array_merge_recursive, ksort, strtolower, }; -use shirabe_semver::constraint::constraint::Constraint; -use shirabe_semver::constraint::constraint_interface::ConstraintInterface; -use shirabe_semver::constraint::match_all_constraint::MatchAllConstraint; -use shirabe_semver::constraint::multi_constraint::MultiConstraint; +use shirabe_semver::constraint::Constraint; +use shirabe_semver::constraint::ConstraintInterface; +use shirabe_semver::constraint::MatchAllConstraint; +use shirabe_semver::constraint::MultiConstraint; -use crate::advisory::partial_security_advisory::PartialSecurityAdvisory; -use crate::advisory::security_advisory::SecurityAdvisory; -use crate::dependency_resolver::pool::Pool; -use crate::dependency_resolver::pool_builder::PoolBuilder; -use crate::dependency_resolver::pool_optimizer::PoolOptimizer; -use crate::dependency_resolver::request::Request; -use crate::dependency_resolver::security_advisory_pool_filter::SecurityAdvisoryPoolFilter; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::io::null_io::NullIO; -use crate::package::alias_package::AliasPackage; -use crate::package::base_package::BasePackage; -use crate::package::complete_alias_package::CompleteAliasPackage; -use crate::package::complete_package::CompletePackage; -use crate::package::package_interface::PackageInterface; -use crate::package::version::stability_filter::StabilityFilter; -use crate::repository::advisory_provider_interface::{ - AdvisoryProviderInterface, PartialOrSecurityAdvisory, -}; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::installed_repository::InstalledRepository; -use crate::repository::installed_repository_interface::InstalledRepositoryInterface; -use crate::repository::lock_array_repository::LockArrayRepository; -use crate::repository::platform_repository::PlatformRepository; -use crate::repository::repository_interface::{FindPackageConstraint, RepositoryInterface}; +use crate::advisory::PartialSecurityAdvisory; +use crate::advisory::SecurityAdvisory; +use crate::dependency_resolver::Pool; +use crate::dependency_resolver::PoolBuilder; +use crate::dependency_resolver::PoolOptimizer; +use crate::dependency_resolver::Request; +use crate::dependency_resolver::SecurityAdvisoryPoolFilter; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::io::NullIO; +use crate::package::AliasPackage; +use crate::package::BasePackage; +use crate::package::CompleteAliasPackage; +use crate::package::CompletePackage; +use crate::package::PackageInterface; +use crate::package::version::StabilityFilter; +use crate::repository::CompositeRepository; +use crate::repository::InstalledRepository; +use crate::repository::InstalledRepositoryInterface; +use crate::repository::LockArrayRepository; +use crate::repository::PlatformRepository; +use crate::repository::{AdvisoryProviderInterface, PartialOrSecurityAdvisory}; +use crate::repository::{FindPackageConstraint, RepositoryInterface}; #[derive(Debug, Clone)] pub struct RootAliasEntry { @@ -124,7 +122,7 @@ impl RepositorySet { let mut acceptable_stabilities: IndexMap<String, i64> = IndexMap::new(); // PHP: foreach (BasePackage::STABILITIES as $stability => $value) - let stabilities = crate::package::base_package::STABILITIES.clone(); + let stabilities = crate::package::STABILITIES.clone(); let min_value = *stabilities.get(minimum_stability).unwrap_or(&0); for (stability, value) in stabilities.iter() { if *value <= min_value { @@ -233,7 +231,7 @@ impl RepositorySet { name_map.insert(name.to_string(), constraint.as_ref().map(|c| c.clone_box())); let acceptable = if ignore_stability { // PHP: BasePackage::STABILITIES - crate::package::base_package::STABILITIES + crate::package::STABILITIES .iter() .map(|(k, v)| (k.to_string(), *v)) .collect() @@ -252,7 +250,7 @@ impl RepositorySet { IndexMap::new(), ); - packages.push(result.packages); + packages.push(result.packages.into_values().collect()); for name_found in result.names_found { // avoid loading the same package again from other repositories once it has been found if name == name_found { @@ -419,9 +417,8 @@ impl RepositorySet { pub fn get_providers( &self, package_name: &str, - ) -> IndexMap<String, crate::repository::repository_interface::ProviderInfo> { - let mut providers: IndexMap<String, crate::repository::repository_interface::ProviderInfo> = - IndexMap::new(); + ) -> IndexMap<String, crate::repository::ProviderInfo> { + let mut providers: IndexMap<String, crate::repository::ProviderInfo> = IndexMap::new(); for repository in &self.repositories { let repo_providers = repository.get_providers(package_name.to_string()); if !repo_providers.is_empty() { diff --git a/crates/shirabe/src/repository/repository_utils.rs b/crates/shirabe/src/repository/repository_utils.rs index 0f4f6a8..7fe98b0 100644 --- a/crates/shirabe/src/repository/repository_utils.rs +++ b/crates/shirabe/src/repository/repository_utils.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Repository/RepositoryUtils.php -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::repository::composite_repository::CompositeRepository; -use crate::repository::filter_repository::FilterRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::repository::CompositeRepository; +use crate::repository::FilterRepository; +use crate::repository::RepositoryInterface; use indexmap::IndexMap; use std::any::Any; @@ -12,11 +12,11 @@ pub struct RepositoryUtils; impl RepositoryUtils { pub fn filter_required_packages( - packages: &[Box<dyn crate::package::base_package::BasePackage>], + packages: &[Box<dyn crate::package::BasePackage>], requirer: &dyn PackageInterface, include_require_dev: bool, - mut bucket: Vec<Box<dyn crate::package::base_package::BasePackage>>, - ) -> Vec<Box<dyn crate::package::base_package::BasePackage>> { + mut bucket: Vec<Box<dyn crate::package::BasePackage>>, + ) -> Vec<Box<dyn crate::package::BasePackage>> { let mut requires: IndexMap<String, Link> = requirer.get_requires(); if include_require_dev { requires.extend(requirer.get_dev_requires()); @@ -27,10 +27,8 @@ impl RepositoryUtils { if requires.contains_key(&name) { let already_in_bucket = bucket.iter().any(|b| { std::ptr::eq( - b.as_ref() as *const dyn crate::package::base_package::BasePackage - as *const (), - candidate.as_ref() - as *const dyn crate::package::base_package::BasePackage + b.as_ref() as *const dyn crate::package::BasePackage as *const (), + candidate.as_ref() as *const dyn crate::package::BasePackage as *const (), ) }); diff --git a/crates/shirabe/src/repository/root_package_repository.rs b/crates/shirabe/src/repository/root_package_repository.rs index 56131f1..6213291 100644 --- a/crates/shirabe/src/repository/root_package_repository.rs +++ b/crates/shirabe/src/repository/root_package_repository.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Repository/RootPackageRepository.php -use crate::package::base_package::BasePackage; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package_interface::RootPackageInterface; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::repository_interface::{ProviderInfo, RepositoryInterface, SearchResult}; +use crate::package::BasePackage; +use crate::package::PackageInterface; +use crate::package::RootPackageInterface; +use crate::repository::ArrayRepository; +use crate::repository::{ProviderInfo, RepositoryInterface, SearchResult}; use indexmap::IndexMap; #[derive(Debug)] @@ -42,7 +42,7 @@ impl RepositoryInterface for RootPackageRepository { fn find_package( &self, name: &str, - constraint: crate::repository::repository_interface::FindPackageConstraint, + constraint: crate::repository::FindPackageConstraint, ) -> Option<Box<dyn BasePackage>> { self.inner.find_package(name, constraint) } @@ -50,7 +50,7 @@ impl RepositoryInterface for RootPackageRepository { fn find_packages( &self, name: &str, - constraint: Option<crate::repository::repository_interface::FindPackageConstraint>, + constraint: Option<crate::repository::FindPackageConstraint>, ) -> Vec<Box<dyn BasePackage>> { self.inner.find_packages(name, constraint) } @@ -63,12 +63,12 @@ impl RepositoryInterface for RootPackageRepository { &self, package_name_map: IndexMap< String, - Option<Box<dyn shirabe_semver::constraint::constraint_interface::ConstraintInterface>>, + Option<Box<dyn shirabe_semver::constraint::ConstraintInterface>>, >, acceptable_stabilities: IndexMap<String, i64>, stability_flags: IndexMap<String, i64>, already_loaded: IndexMap<String, IndexMap<String, Box<dyn PackageInterface>>>, - ) -> crate::repository::repository_interface::LoadPackagesResult { + ) -> crate::repository::LoadPackagesResult { self.inner.load_packages( package_name_map, acceptable_stabilities, diff --git a/crates/shirabe/src/repository/vcs/forgejo_driver.rs b/crates/shirabe/src/repository/vcs/forgejo_driver.rs index f4a86c7..18df35d 100644 --- a/crates/shirabe/src/repository/vcs/forgejo_driver.rs +++ b/crates/shirabe/src/repository/vcs/forgejo_driver.rs @@ -3,23 +3,23 @@ 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::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ PhpMixed, RuntimeException, base64_decode, explode, extension_loaded, urlencode, }; use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::git_driver::GitDriver; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::util::forgejo::Forgejo; -use crate::util::forgejo_repository_data::ForgejoRepositoryData; -use crate::util::forgejo_url::ForgejoUrl; -use crate::util::http::response::Response; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::GitDriver; +use crate::repository::vcs::VcsDriverBase; +use crate::repository::vcs::VcsDriverInterface; +use crate::util::Forgejo; +use crate::util::ForgejoRepositoryData; +use crate::util::ForgejoUrl; +use crate::util::http::Response; #[derive(Debug)] pub struct ForgejoDriver { diff --git a/crates/shirabe/src/repository/vcs/fossil_driver.rs b/crates/shirabe/src/repository/vcs/fossil_driver.rs index f773e3b..4982d17 100644 --- a/crates/shirabe/src/repository/vcs/fossil_driver.rs +++ b/crates/shirabe/src/repository/vcs/fossil_driver.rs @@ -3,15 +3,15 @@ use crate::io::io_interface; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{PhpMixed, RuntimeException, dirname, is_dir, is_file, is_writable}; use crate::cache::Cache; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::repository::vcs::VcsDriverBase; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct FossilDriver { diff --git a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs index a5c6ed3..1cb7b46 100644 --- a/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_bitbucket_driver.rs @@ -4,7 +4,7 @@ use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, RuntimeException, array_key_exists, array_search_mixed, extension_loaded, http_build_query_mixed, implode, in_array, is_array, @@ -13,14 +13,14 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::git_driver::GitDriver; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::util::bitbucket::Bitbucket; -use crate::util::http::response::Response; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::GitDriver; +use crate::repository::vcs::VcsDriverBase; +use crate::repository::vcs::VcsDriverInterface; +use crate::util::Bitbucket; +use crate::util::http::Response; #[derive(Debug)] pub struct GitBitbucketDriver { diff --git a/crates/shirabe/src/repository/vcs/git_driver.rs b/crates/shirabe/src/repository/vcs/git_driver.rs index 7ab185f..8c0aefd 100644 --- a/crates/shirabe/src/repository/vcs/git_driver.rs +++ b/crates/shirabe/src/repository/vcs/git_driver.rs @@ -4,7 +4,7 @@ use crate::io::io_interface; use chrono::TimeZone; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, RuntimeException, dirname, is_dir, is_writable, realpath, sys_get_temp_dir, @@ -12,12 +12,12 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::util::filesystem::Filesystem; -use crate::util::git::Git as GitUtil; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::io::IOInterface; +use crate::repository::vcs::VcsDriverBase; +use crate::util::Filesystem; +use crate::util::Git as GitUtil; +use crate::util::ProcessExecutor; +use crate::util::Url; #[derive(Debug)] pub struct GitDriver { @@ -33,9 +33,7 @@ impl GitDriver { repo_config: IndexMap<String, shirabe_php_shim::PhpMixed>, io: Box<dyn IOInterface>, config: std::rc::Rc<std::cell::RefCell<Config>>, - http_downloader: std::rc::Rc< - std::cell::RefCell<crate::util::http_downloader::HttpDownloader>, - >, + http_downloader: std::rc::Rc<std::cell::RefCell<crate::util::HttpDownloader>>, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, ) -> Self { Self { @@ -481,7 +479,7 @@ impl GitDriver { // TODO(phase-b): implement VcsDriverInterface for GitDriver — signatures here // differ from the trait (some &mut self vs &self, different return shapes), so // each method delegates via todo!() until reconciled. -impl crate::repository::vcs::vcs_driver_interface::VcsDriverInterface for GitDriver { +impl crate::repository::vcs::VcsDriverInterface for GitDriver { fn initialize(&mut self) -> anyhow::Result<()> { GitDriver::initialize(self) } diff --git a/crates/shirabe/src/repository/vcs/github_driver.rs b/crates/shirabe/src/repository/vcs/github_driver.rs index 17463c1..c2207ee 100644 --- a/crates/shirabe/src/repository/vcs/github_driver.rs +++ b/crates/shirabe/src/repository/vcs/github_driver.rs @@ -4,7 +4,7 @@ use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, RuntimeException, array_diff, array_key_exists, array_map, array_search_mixed, base64_decode, basename, count, empty, explode, extension_loaded, in_array, @@ -13,14 +13,14 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::git_driver::GitDriver; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::util::github::GitHub; -use crate::util::http::response::Response; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::GitDriver; +use crate::repository::vcs::VcsDriverBase; +use crate::repository::vcs::VcsDriverInterface; +use crate::util::GitHub; +use crate::util::http::Response; #[derive(Debug)] pub struct GitHubDriver { diff --git a/crates/shirabe/src/repository/vcs/gitlab_driver.rs b/crates/shirabe/src/repository/vcs/gitlab_driver.rs index 3efb38c..1966237 100644 --- a/crates/shirabe/src/repository/vcs/gitlab_driver.rs +++ b/crates/shirabe/src/repository/vcs/gitlab_driver.rs @@ -4,7 +4,7 @@ use crate::io::io_interface; use anyhow::Result; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, RuntimeException, array_search_mixed, array_shift, ctype_alnum, empty, explode, extension_loaded, implode, in_array, is_array, @@ -13,15 +13,15 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::git_driver::GitDriver; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::util::gitlab::GitLab; -use crate::util::http::response::Response; -use crate::util::http_downloader::HttpDownloader; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::GitDriver; +use crate::repository::vcs::VcsDriverBase; +use crate::repository::vcs::VcsDriverInterface; +use crate::util::GitLab; +use crate::util::HttpDownloader; +use crate::util::http::Response; /// Driver for GitLab API, use the Git driver for local checkouts. #[derive(Debug)] diff --git a/crates/shirabe/src/repository/vcs/hg_driver.rs b/crates/shirabe/src/repository/vcs/hg_driver.rs index eb1be8f..8f40d2a 100644 --- a/crates/shirabe/src/repository/vcs/hg_driver.rs +++ b/crates/shirabe/src/repository/vcs/hg_driver.rs @@ -2,15 +2,15 @@ use crate::cache::Cache; use crate::config::Config; +use crate::io::IOInterface; use crate::io::io_interface; -use crate::io::io_interface::IOInterface; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::util::filesystem::Filesystem; -use crate::util::hg::Hg as HgUtils; -use crate::util::url::Url; +use crate::repository::vcs::VcsDriverBase; +use crate::util::Filesystem; +use crate::util::Hg as HgUtils; +use crate::util::Url; use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{RuntimeException, dirname, is_dir, is_writable}; #[derive(Debug)] @@ -84,7 +84,7 @@ impl HgDriver { Some(self.repo_dir.clone()), ) != 0 { - self.inner.io.write_error3(&format!("<error>Failed to update {}, package information from this repository may be outdated ({})</error>", self.inner.url, self.inner.process.borrow().get_error_output()), true, crate::io::io_interface::NORMAL); + self.inner.io.write_error3(&format!("<error>Failed to update {}, package information from this repository may be outdated ({})</error>", self.inner.url, self.inner.process.borrow().get_error_output()), true, crate::io::NORMAL); } } else { let mut fs2 = Filesystem::new(None); @@ -324,7 +324,7 @@ impl HgDriver { return false; } - let mut process = crate::util::process_executor::ProcessExecutor::new(io); + let mut process = crate::util::ProcessExecutor::new(io); let mut output = String::new(); if process.execute_args( &["hg", "summary"].map(|s| s.to_string()).to_vec(), @@ -340,7 +340,7 @@ impl HgDriver { return false; } - let mut process = crate::util::process_executor::ProcessExecutor::new(io); + let mut process = crate::util::ProcessExecutor::new(io); let mut ignored = String::new(); let exit = process.execute_args( &["hg", "identify", "--", url] diff --git a/crates/shirabe/src/repository/vcs/mod.rs b/crates/shirabe/src/repository/vcs/mod.rs index 4bbf4a6..715d2e5 100644 --- a/crates/shirabe/src/repository/vcs/mod.rs +++ b/crates/shirabe/src/repository/vcs/mod.rs @@ -9,3 +9,15 @@ pub mod perforce_driver; pub mod svn_driver; pub mod vcs_driver; pub mod vcs_driver_interface; + +pub use forgejo_driver::*; +pub use fossil_driver::*; +pub use git_bitbucket_driver::*; +pub use git_driver::*; +pub use github_driver::*; +pub use gitlab_driver::*; +pub use hg_driver::*; +pub use perforce_driver::*; +pub use svn_driver::*; +pub use vcs_driver::*; +pub use vcs_driver_interface::*; diff --git a/crates/shirabe/src/repository/vcs/perforce_driver.rs b/crates/shirabe/src/repository/vcs/perforce_driver.rs index a5b0d02..0bd6d12 100644 --- a/crates/shirabe/src/repository/vcs/perforce_driver.rs +++ b/crates/shirabe/src/repository/vcs/perforce_driver.rs @@ -1,16 +1,16 @@ //! ref: composer/src/Composer/Repository/Vcs/PerforceDriver.php use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{BadMethodCallException, PhpMixed, RuntimeException}; use crate::cache::Cache; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::util::http::response::Response; -use crate::util::perforce::Perforce; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::repository::vcs::VcsDriverBase; +use crate::util::Perforce; +use crate::util::ProcessExecutor; +use crate::util::http::Response; #[derive(Debug)] pub struct PerforceDriver { diff --git a/crates/shirabe/src/repository/vcs/svn_driver.rs b/crates/shirabe/src/repository/vcs/svn_driver.rs index 27fccc3..a6ca9c1 100644 --- a/crates/shirabe/src/repository/vcs/svn_driver.rs +++ b/crates/shirabe/src/repository/vcs/svn_driver.rs @@ -3,7 +3,7 @@ use anyhow::Result; use chrono::{DateTime, TimeZone, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed, RuntimeException, array_key_exists, is_array, max, sprintf, stripos, strrpos, strtr, substr, trim, @@ -11,14 +11,14 @@ use shirabe_php_shim::{ use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::vcs_driver::VcsDriverBase; -use crate::util::filesystem::Filesystem; -use crate::util::process_executor::ProcessExecutor; -use crate::util::svn::Svn as SvnUtil; -use crate::util::url::Url; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::VcsDriverBase; +use crate::util::Filesystem; +use crate::util::ProcessExecutor; +use crate::util::Svn as SvnUtil; +use crate::util::Url; #[derive(Debug)] pub struct SvnDriver { diff --git a/crates/shirabe/src/repository/vcs/vcs_driver.rs b/crates/shirabe/src/repository/vcs/vcs_driver.rs index 45c998b..71476b9 100644 --- a/crates/shirabe/src/repository/vcs/vcs_driver.rs +++ b/crates/shirabe/src/repository/vcs/vcs_driver.rs @@ -2,21 +2,21 @@ use chrono::{DateTime, Utc}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ JSON_UNESCAPED_SLASHES, JSON_UNESCAPED_UNICODE, PhpMixed, extension_loaded, }; use crate::cache::Cache; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::util::filesystem::Filesystem; -use crate::util::http::response::Response; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::repository::vcs::VcsDriverInterface; +use crate::util::Filesystem; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; +use crate::util::http::Response; #[derive(Debug)] pub struct VcsDriverBase { diff --git a/crates/shirabe/src/repository/vcs/vcs_driver_interface.rs b/crates/shirabe/src/repository/vcs/vcs_driver_interface.rs index 236b9b4..7ace36a 100644 --- a/crates/shirabe/src/repository/vcs/vcs_driver_interface.rs +++ b/crates/shirabe/src/repository/vcs/vcs_driver_interface.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Repository/Vcs/VcsDriverInterface.php use crate::config::Config; -use crate::io::io_interface::IOInterface; +use crate::io::IOInterface; use chrono::{DateTime, Utc}; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe/src/repository/vcs_repository.rs b/crates/shirabe/src/repository/vcs_repository.rs index 3a33c85..05dd329 100644 --- a/crates/shirabe/src/repository/vcs_repository.rs +++ b/crates/shirabe/src/repository/vcs_repository.rs @@ -3,33 +3,33 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, PhpMixed, array_search_mixed, count, get_class, in_array, str_replace, strpos, }; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::event_dispatcher::event_dispatcher::EventDispatcher; -use crate::io::io_interface::IOInterface; -use crate::package::base_package::BasePackage; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::invalid_package_exception::InvalidPackageException; -use crate::package::loader::loader_interface::LoaderInterface; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; -use crate::package::version::version_parser::VersionParser; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::configurable_repository_interface::ConfigurableRepositoryInterface; -use crate::repository::invalid_repository_exception::InvalidRepositoryException; -use crate::repository::repository_interface::RepositoryInterface; -use crate::repository::vcs::vcs_driver_interface::VcsDriverInterface; -use crate::repository::version_cache_interface::{VersionCacheInterface, VersionCacheResult}; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::downloader::TransportException; +use crate::event_dispatcher::EventDispatcher; +use crate::io::IOInterface; +use crate::package::BasePackage; +use crate::package::loader::ArrayLoader; +use crate::package::loader::InvalidPackageException; +use crate::package::loader::LoaderInterface; +use crate::package::loader::ValidatingArrayLoader; +use crate::package::version::VersionParser; +use crate::repository::ArrayRepository; +use crate::repository::ConfigurableRepositoryInterface; +use crate::repository::InvalidRepositoryException; +use crate::repository::RepositoryInterface; +use crate::repository::vcs::VcsDriverInterface; +use crate::repository::{VersionCacheInterface, VersionCacheResult}; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url; #[derive(Debug)] pub struct VcsRepository { @@ -387,8 +387,7 @@ impl VcsRepository { match cached_package { CachedPackageResult::Package(pkg) => { // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> - let pkg_pi: Box<dyn crate::package::package_interface::PackageInterface> = - pkg.clone_package_box(); + let pkg_pi: Box<dyn crate::package::PackageInterface> = pkg.clone_package_box(); self.inner.add_package(pkg_pi)?; continue; } @@ -515,9 +514,9 @@ impl VcsRepository { }); if let Some(existing_package) = self.inner.find_package( &tag_package_name, - crate::repository::repository_interface::FindPackageConstraint::Constraint( - Box::new(Constraint::new("=", &version_normalized)), - ), + crate::repository::FindPackageConstraint::Constraint(Box::new( + Constraint::new("=", &version_normalized), + )), ) { if is_very_verbose { self.io.write_error(&format!( @@ -537,7 +536,7 @@ impl VcsRepository { let processed = self.pre_process(&**driver, data, &identifier)?; let loaded = self.loader.as_ref().unwrap().load(processed, None)?; // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> - let loaded_pi: Box<dyn crate::package::package_interface::PackageInterface> = + let loaded_pi: Box<dyn crate::package::PackageInterface> = loaded.clone_package_box(); self.inner.add_package(loaded_pi)?; Ok(()) @@ -658,8 +657,7 @@ impl VcsRepository { match cached_package { CachedPackageResult::Package(pkg) => { // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> - let pkg_pi: Box<dyn crate::package::package_interface::PackageInterface> = - pkg.clone_package_box(); + let pkg_pi: Box<dyn crate::package::PackageInterface> = pkg.clone_package_box(); self.inner.add_package(pkg_pi)?; continue; } @@ -724,7 +722,7 @@ impl VcsRepository { } } // TODO(phase-b): trait upcast Box<dyn BasePackage> -> Box<dyn PackageInterface> - let package_pi: Box<dyn crate::package::package_interface::PackageInterface> = + let package_pi: Box<dyn crate::package::PackageInterface> = package.clone_package_box(); self.inner.add_package(package_pi)?; Ok(()) @@ -951,9 +949,10 @@ impl VcsRepository { .to_string(); if let Some(existing_package) = self.inner.find_package( &name, - crate::repository::repository_interface::FindPackageConstraint::Constraint( - Box::new(Constraint::new("=", &version_normalized)), - ), + crate::repository::FindPackageConstraint::Constraint(Box::new(Constraint::new( + "=", + &version_normalized, + ))), ) { if is_very_verbose { self.io.write_error(&format!( diff --git a/crates/shirabe/src/repository/writable_array_repository.rs b/crates/shirabe/src/repository/writable_array_repository.rs index 05c6bfa..663ab52 100644 --- a/crates/shirabe/src/repository/writable_array_repository.rs +++ b/crates/shirabe/src/repository/writable_array_repository.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Repository/WritableArrayRepository.php -use crate::installer::installation_manager::InstallationManager; -use crate::repository::array_repository::ArrayRepository; -use crate::repository::repository_interface::RepositoryInterface; +use crate::installer::InstallationManager; +use crate::repository::ArrayRepository; +use crate::repository::RepositoryInterface; use anyhow::Result; use shirabe_php_shim::Countable; @@ -14,9 +14,7 @@ pub struct WritableArrayRepository { } impl WritableArrayRepository { - pub fn new( - packages: Vec<Box<dyn crate::package::package_interface::PackageInterface>>, - ) -> Result<Self> { + pub fn new(packages: Vec<Box<dyn crate::package::PackageInterface>>) -> Result<Self> { Ok(Self { inner: ArrayRepository::new(packages)?, dev_package_names: Vec::new(), @@ -52,15 +50,12 @@ impl WritableArrayRepository { pub fn add_package( &mut self, - package: Box<dyn crate::package::package_interface::PackageInterface>, + package: Box<dyn crate::package::PackageInterface>, ) -> Result<()> { self.inner.add_package(package) } - pub fn remove_package( - &mut self, - package: &dyn crate::package::package_interface::PackageInterface, - ) -> Result<()> { + pub fn remove_package(&mut self, package: &dyn crate::package::PackageInterface) -> Result<()> { let _ = package; // TODO(phase-b): delegate to ArrayRepository once it implements remove_package Ok(()) @@ -71,16 +66,12 @@ impl WritableArrayRepository { Ok(()) } - pub fn get_canonical_packages( - &self, - ) -> Vec<Box<dyn crate::package::package_interface::PackageInterface>> { + pub fn get_canonical_packages(&self) -> Vec<Box<dyn crate::package::PackageInterface>> { // TODO(phase-b): delegate to inner once it exposes get_canonical_packages Vec::new() } - pub fn get_packages( - &self, - ) -> Vec<Box<dyn crate::package::package_interface::PackageInterface>> { + pub fn get_packages(&self) -> Vec<Box<dyn crate::package::PackageInterface>> { // TODO(phase-b): delegate to inner ArrayRepository::get_packages Vec::new() } diff --git a/crates/shirabe/src/repository/writable_repository_interface.rs b/crates/shirabe/src/repository/writable_repository_interface.rs index 5648ef5..7094211 100644 --- a/crates/shirabe/src/repository/writable_repository_interface.rs +++ b/crates/shirabe/src/repository/writable_repository_interface.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Repository/WritableRepositoryInterface.php -use crate::installer::installation_manager::InstallationManager; -use crate::package::package_interface::PackageInterface; -use crate::repository::repository_interface::RepositoryInterface; +use crate::installer::InstallationManager; +use crate::package::PackageInterface; +use crate::repository::RepositoryInterface; use anyhow::Result; pub trait WritableRepositoryInterface: RepositoryInterface { diff --git a/crates/shirabe/src/script/event.rs b/crates/shirabe/src/script/event.rs index 4be0814..9e6278a 100644 --- a/crates/shirabe/src/script/event.rs +++ b/crates/shirabe/src/script/event.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Script/Event.php use crate::composer::Composer; -use crate::event_dispatcher::event::Event as BaseEvent; -use crate::io::io_interface::IOInterface; +use crate::event_dispatcher::Event as BaseEvent; +use crate::io::IOInterface; use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; diff --git a/crates/shirabe/src/script/mod.rs b/crates/shirabe/src/script/mod.rs index 9b83051..e8b657f 100644 --- a/crates/shirabe/src/script/mod.rs +++ b/crates/shirabe/src/script/mod.rs @@ -1,2 +1,5 @@ pub mod event; pub mod script_events; + +pub use event::*; +pub use script_events::*; diff --git a/crates/shirabe/src/self_update/mod.rs b/crates/shirabe/src/self_update/mod.rs index 4f9f188..5594811 100644 --- a/crates/shirabe/src/self_update/mod.rs +++ b/crates/shirabe/src/self_update/mod.rs @@ -1,2 +1,5 @@ pub mod keys; pub mod versions; + +pub use keys::*; +pub use versions::*; diff --git a/crates/shirabe/src/self_update/versions.rs b/crates/shirabe/src/self_update/versions.rs index 36c6dea..c503007 100644 --- a/crates/shirabe/src/self_update/versions.rs +++ b/crates/shirabe/src/self_update/versions.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/SelfUpdate/Versions.php use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::util::http_downloader::HttpDownloader; +use crate::io::IOInterface; +use crate::util::HttpDownloader; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ InvalidArgumentException, PHP_EOL, PHP_VERSION, PHP_VERSION_ID, PhpMixed, UnexpectedValueException, diff --git a/crates/shirabe/src/util/auth_helper.rs b/crates/shirabe/src/util/auth_helper.rs index 1bbe7dc..908839e 100644 --- a/crates/shirabe/src/util/auth_helper.rs +++ b/crates/shirabe/src/util/auth_helper.rs @@ -3,7 +3,7 @@ use crate::io::io_interface; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ E_USER_DEPRECATED, PHP_URL_HOST, PHP_URL_PATH, PHP_URL_SCHEME, PhpMixed, base64_encode, explode, in_array, is_array, is_string, json_decode, parse_url, sprintf, str_replace, strpos, @@ -11,11 +11,11 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::util::bitbucket::Bitbucket; -use crate::util::github::GitHub; -use crate::util::gitlab::GitLab; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::util::Bitbucket; +use crate::util::GitHub; +use crate::util::GitLab; #[derive(Debug)] pub struct AuthHelper { diff --git a/crates/shirabe/src/util/bitbucket.rs b/crates/shirabe/src/util/bitbucket.rs index ef1d4bf..1708447 100644 --- a/crates/shirabe/src/util/bitbucket.rs +++ b/crates/shirabe/src/util/bitbucket.rs @@ -5,11 +5,11 @@ use indexmap::IndexMap; use shirabe_php_shim::{LogicException, PhpMixed, time}; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; fn transport_error_code(err: &anyhow::Error) -> Option<i64> { err.downcast_ref::<TransportException>().map(|te| te.code) diff --git a/crates/shirabe/src/util/composer_mirror.rs b/crates/shirabe/src/util/composer_mirror.rs index d70af94..6f15a13 100644 --- a/crates/shirabe/src/util/composer_mirror.rs +++ b/crates/shirabe/src/util/composer_mirror.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Util/ComposerMirror.php -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::hash; pub struct ComposerMirror; diff --git a/crates/shirabe/src/util/config_validator.rs b/crates/shirabe/src/util/config_validator.rs index 4e99da0..ee78c26 100644 --- a/crates/shirabe/src/util/config_validator.rs +++ b/crates/shirabe/src/util/config_validator.rs @@ -1,16 +1,16 @@ //! ref: composer/src/Composer/Util/ConfigValidator.php -use crate::io::io_interface::IOInterface; -use crate::json::json_file::JsonFile; -use crate::json::json_validation_exception::JsonValidationException; -use crate::package::loader::array_loader::ArrayLoader; -use crate::package::loader::invalid_package_exception::InvalidPackageException; -use crate::package::loader::validating_array_loader::ValidatingArrayLoader; +use crate::io::IOInterface; +use crate::json::JsonFile; +use crate::json::JsonValidationException; +use crate::package::loader::ArrayLoader; +use crate::package::loader::InvalidPackageException; +use crate::package::loader::ValidatingArrayLoader; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::composer::spdx_licenses::spdx_licenses::SpdxLicenses; -use shirabe_external_packages::seld::json_lint::duplicate_key_exception::DuplicateKeyException; -use shirabe_external_packages::seld::json_lint::json_parser::JsonParser; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; +use shirabe_external_packages::seld::json_lint::DuplicateKeyException; +use shirabe_external_packages::seld::json_lint::JsonParser; use shirabe_php_shim::PhpMixed; #[derive(Debug)] diff --git a/crates/shirabe/src/util/error_handler.rs b/crates/shirabe/src/util/error_handler.rs index d531658..c0648be 100644 --- a/crates/shirabe/src/util/error_handler.rs +++ b/crates/shirabe/src/util/error_handler.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Util/ErrorHandler.php -use crate::io::io_interface::IOInterface; +use crate::io::IOInterface; use shirabe_php_shim::{ E_ALL, E_DEPRECATED, E_USER_DEPRECATED, E_USER_WARNING, E_WARNING, ErrorException, FILTER_VALIDATE_BOOLEAN, PHP_EOL, PhpMixed, STDERR, debug_backtrace, error_reporting, diff --git a/crates/shirabe/src/util/filesystem.rs b/crates/shirabe/src/util/filesystem.rs index e51c1e2..a51b0f3 100644 --- a/crates/shirabe/src/util/filesystem.rs +++ b/crates/shirabe/src/util/filesystem.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Util/Filesystem.php -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::filesystem::exception::io_exception::IOException; -use shirabe_external_packages::symfony::component::finder::finder::Finder; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::filesystem::exception::IOException; +use shirabe_external_packages::symfony::component::finder::Finder; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, ErrorException, InvalidArgumentException, LogicException, PhpMixed, RuntimeException, UnexpectedValueException, array_pop, basename, chdir, clearstatcache, @@ -15,9 +15,9 @@ use shirabe_php_shim::{ substr_count, symlink, touch, unlink, usleep, var_export, }; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Silencer; #[derive(Debug)] pub struct Filesystem { @@ -702,7 +702,7 @@ impl Filesystem { // extract a prefix being a protocol://, protocol:, protocol://drive: or simply drive: let mut prefix_match: indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, > = indexmap::IndexMap::new(); if Preg::is_match_strict_groups3( @@ -713,7 +713,7 @@ impl Filesystem { .unwrap_or(false) { prefix = prefix_match - .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1)) + .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(1)) .cloned() .unwrap_or_default(); path = substr(&path, strlen(&prefix), None); @@ -739,12 +739,12 @@ impl Filesystem { prefix = Preg::replace_callback( "{(^|://)[a-z]:$}i", |m: &indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, >| -> String { let s = m - .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(0)) + .get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(0)) .cloned() .unwrap_or_default(); strtoupper(&s) diff --git a/crates/shirabe/src/util/forgejo.rs b/crates/shirabe/src/util/forgejo.rs index 002e4e5..0e1d52d 100644 --- a/crates/shirabe/src/util/forgejo.rs +++ b/crates/shirabe/src/util/forgejo.rs @@ -1,10 +1,10 @@ //! ref: composer/src/Composer/Util/Forgejo.php use crate::config::Config; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; +use crate::io::IOInterface; use crate::io::io_interface; -use crate::io::io_interface::IOInterface; -use crate::util::http_downloader::HttpDownloader; +use crate::util::HttpDownloader; #[derive(Debug)] pub struct Forgejo { @@ -124,7 +124,7 @@ impl Forgejo { // TODO(phase-b): anyhow::Error has no get_code(); HTTP status codes come from // TransportException::get_status_code(). let code = e - .downcast_ref::<crate::downloader::transport_exception::TransportException>() + .downcast_ref::<crate::downloader::TransportException>() .and_then(|te| te.get_status_code()) .unwrap_or(0); if [403, 401, 404].contains(&code) { diff --git a/crates/shirabe/src/util/forgejo_url.rs b/crates/shirabe/src/util/forgejo_url.rs index 5fdaab7..90a1424 100644 --- a/crates/shirabe/src/util/forgejo_url.rs +++ b/crates/shirabe/src/util/forgejo_url.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Util/ForgejoUrl.php use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::InvalidArgumentException; #[derive(Debug)] @@ -39,13 +39,13 @@ impl ForgejoUrl { pub fn try_from(repo_url: Option<&str>) -> Option<Self> { let repo_url = repo_url?; let mut matches: indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, > = indexmap::IndexMap::new(); if !Preg::match3(Self::URL_REGEX, repo_url, Some(&mut matches)).unwrap_or(false) { return None; } - use shirabe_external_packages::composer::pcre::preg::CaptureKey; + use shirabe_external_packages::composer::pcre::CaptureKey; let m: Vec<String> = (0..5) .map(|i| { matches diff --git a/crates/shirabe/src/util/git.rs b/crates/shirabe/src/util/git.rs index cd5082f..d8e11d9 100644 --- a/crates/shirabe/src/util/git.rs +++ b/crates/shirabe/src/util/git.rs @@ -5,7 +5,7 @@ use anyhow::Result; use indexmap::IndexMap; use std::sync::Mutex; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ InvalidArgumentException, PHP_EOL, PhpMixed, RuntimeException, array_map, array_merge_recursive, clearstatcache, count, explode, implode, in_array, is_array, @@ -14,16 +14,16 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::util::auth_helper::{AuthHelper, StoreAuth}; -use crate::util::bitbucket::Bitbucket; -use crate::util::filesystem::Filesystem; -use crate::util::github::GitHub; -use crate::util::gitlab::GitLab; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::io::IOInterface; +use crate::util::Bitbucket; +use crate::util::Filesystem; +use crate::util::GitHub; +use crate::util::GitLab; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::ProcessExecutor; +use crate::util::Url; +use crate::util::{AuthHelper, StoreAuth}; #[derive(Debug)] pub struct Git { diff --git a/crates/shirabe/src/util/github.rs b/crates/shirabe/src/util/github.rs index c9513aa..f8a592e 100644 --- a/crates/shirabe/src/util/github.rs +++ b/crates/shirabe/src/util/github.rs @@ -2,15 +2,15 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{PhpMixed, date, stripos, strtolower}; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct GitHub { @@ -240,7 +240,7 @@ impl GitHub { Err(te) => { // TODO(phase-b): downcast anyhow::Error to TransportException for status code let code = te - .downcast_ref::<crate::downloader::transport_exception::TransportException>() + .downcast_ref::<crate::downloader::TransportException>() .and_then(|t| t.get_status_code()) .unwrap_or(0); if code == 403 || code == 401 { diff --git a/crates/shirabe/src/util/gitlab.rs b/crates/shirabe/src/util/gitlab.rs index 7049686..88563db 100644 --- a/crates/shirabe/src/util/gitlab.rs +++ b/crates/shirabe/src/util/gitlab.rs @@ -2,15 +2,15 @@ use crate::io::io_interface; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{PhpMixed, RuntimeException, http_build_query, json_decode, time}; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; use crate::factory::Factory; -use crate::io::io_interface::IOInterface; -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; #[derive(Debug)] pub struct GitLab { diff --git a/crates/shirabe/src/util/hg.rs b/crates/shirabe/src/util/hg.rs index 0d4d36d..b6bdd04 100644 --- a/crates/shirabe/src/util/hg.rs +++ b/crates/shirabe/src/util/hg.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Util/Hg.php use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::util::process_executor::ProcessExecutor; -use crate::util::url::Url; +use crate::io::IOInterface; +use crate::util::ProcessExecutor; +use crate::util::Url; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::rawurlencode; use std::sync::OnceLock; diff --git a/crates/shirabe/src/util/http/curl_downloader.rs b/crates/shirabe/src/util/http/curl_downloader.rs index fd46220..bd6817c 100644 --- a/crates/shirabe/src/util/http/curl_downloader.rs +++ b/crates/shirabe/src/util/http/curl_downloader.rs @@ -4,7 +4,7 @@ use std::sync::atomic::{AtomicBool, Ordering}; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ CURL_HTTP_VERSION_2_0, CURL_HTTP_VERSION_3, CURL_IPRESOLVE_V4, CURL_IPRESOLVE_V6, CURL_LOCK_DATA_COOKIE, CURL_LOCK_DATA_DNS, CURL_LOCK_DATA_SSL_SESSION, CURL_VERSION_HTTP2, @@ -26,17 +26,17 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::downloader::max_file_size_exceeded_exception::MaxFileSizeExceededException; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::util::auth_helper::{AuthHelper, PromptAuthResult, StoreAuth}; -use crate::util::http::curl_response::CurlResponse; -use crate::util::http::proxy_manager::ProxyManager; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::stream_context_factory::StreamContextFactory; -use crate::util::url::Url; -// use shirabe_external_packages::react::promise::promise::Promise; // typehint only in PHP +use crate::downloader::MaxFileSizeExceededException; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::StreamContextFactory; +use crate::util::Url; +use crate::util::http::CurlResponse; +use crate::util::http::ProxyManager; +use crate::util::{AuthHelper, PromptAuthResult, StoreAuth}; +// use shirabe_external_packages::react::promise::Promise; // typehint only in PHP /// @phpstan-type Attributes array{retryAuthFailure: bool, redirects: int<0, max>, retries: int<0, max>, storeAuth: 'prompt'|bool, ipResolve: 4|6|null} /// @phpstan-type Job array{url: non-empty-string, origin: string, attributes: Attributes, options: mixed[], progress: mixed[], curlHandle: \CurlHandle, filename: string|null, headerHandle: resource, bodyHandle: resource, resolve: callable, reject: callable, primaryIp: string} @@ -699,7 +699,7 @@ impl CurlDownloader { if_modified ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } @@ -843,7 +843,7 @@ impl CurlDownloader { self.io.write_error3( "<warning>A connection timeout was encountered. If you intend to run Composer without connecting to the internet, run the command again prefixed with COMPOSER_DISABLE_NETWORK=1 to make Composer run in offline mode.</warning>", true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -929,7 +929,7 @@ impl CurlDownloader { errno ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); self.restart_job_with_delay( &job, @@ -961,7 +961,7 @@ impl CurlDownloader { errno ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); let mut attrs: IndexMap<String, PhpMixed> = IndexMap::new(); attrs.insert( @@ -1095,7 +1095,7 @@ impl CurlDownloader { ) ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } else { let max_file_size: Option<i64> = job @@ -1174,7 +1174,7 @@ impl CurlDownloader { ) ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); } fclose(job.get("bodyHandle").cloned().unwrap_or(PhpMixed::Null)); @@ -1323,7 +1323,7 @@ impl CurlDownloader { sc ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); let mut attrs: IndexMap<String, PhpMixed> = IndexMap::new(); attrs.insert( @@ -1632,7 +1632,7 @@ impl CurlDownloader { ], ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); return Ok(Ok(target_url)); diff --git a/crates/shirabe/src/util/http/curl_response.rs b/crates/shirabe/src/util/http/curl_response.rs index c6f5d77..9f330b6 100644 --- a/crates/shirabe/src/util/http/curl_response.rs +++ b/crates/shirabe/src/util/http/curl_response.rs @@ -3,7 +3,7 @@ use indexmap::IndexMap; use shirabe_php_shim::PhpMixed; -use super::response::Response; +use super::Response; #[derive(Debug)] pub struct CurlResponse { diff --git a/crates/shirabe/src/util/http/mod.rs b/crates/shirabe/src/util/http/mod.rs index 4ee97c5..19e5a86 100644 --- a/crates/shirabe/src/util/http/mod.rs +++ b/crates/shirabe/src/util/http/mod.rs @@ -4,3 +4,10 @@ pub mod proxy_item; pub mod proxy_manager; pub mod request_proxy; pub mod response; + +pub use curl_downloader::*; +pub use curl_response::*; +pub use proxy_item::*; +pub use proxy_manager::*; +pub use request_proxy::*; +pub use response::*; diff --git a/crates/shirabe/src/util/http/proxy_item.rs b/crates/shirabe/src/util/http/proxy_item.rs index db71476..1a0b3ee 100644 --- a/crates/shirabe/src/util/http/proxy_item.rs +++ b/crates/shirabe/src/util/http/proxy_item.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Util/Http/ProxyItem.php -use crate::util::http::request_proxy::RequestProxy; +use crate::util::http::RequestProxy; use indexmap::IndexMap; use shirabe_php_shim::{ PhpMixed, RuntimeException, base64_encode, parse_url_all, rawurldecode, strpbrk, diff --git a/crates/shirabe/src/util/http/proxy_manager.rs b/crates/shirabe/src/util/http/proxy_manager.rs index 13a9920..eac3cb2 100644 --- a/crates/shirabe/src/util/http/proxy_manager.rs +++ b/crates/shirabe/src/util/http/proxy_manager.rs @@ -2,10 +2,10 @@ use std::sync::{Mutex, OnceLock}; -use crate::downloader::transport_exception::TransportException; -use crate::util::http::proxy_item::ProxyItem; -use crate::util::http::request_proxy::RequestProxy; -use crate::util::no_proxy_pattern::NoProxyPattern; +use crate::downloader::TransportException; +use crate::util::NoProxyPattern; +use crate::util::http::ProxyItem; +use crate::util::http::RequestProxy; static INSTANCE: OnceLock<Mutex<Option<ProxyManager>>> = OnceLock::new(); diff --git a/crates/shirabe/src/util/http/request_proxy.rs b/crates/shirabe/src/util/http/request_proxy.rs index a85e283..876b8cc 100644 --- a/crates/shirabe/src/util/http/request_proxy.rs +++ b/crates/shirabe/src/util/http/request_proxy.rs @@ -7,7 +7,7 @@ use shirabe_php_shim::{ PhpMixed, curl_version, }; -use crate::downloader::transport_exception::TransportException; +use crate::downloader::TransportException; // contextOptions = array{http: array{proxy: string, header?: string, request_fulluri?: bool}} type ContextOptions = IndexMap<String, IndexMap<String, PhpMixed>>; diff --git a/crates/shirabe/src/util/http/response.rs b/crates/shirabe/src/util/http/response.rs index ef86ec9..a2bc0f1 100644 --- a/crates/shirabe/src/util/http/response.rs +++ b/crates/shirabe/src/util/http/response.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Util/Http/Response.php -use crate::json::json_file::JsonFile; +use crate::json::JsonFile; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{LogicException, PhpMixed, preg_quote}; #[derive(Debug)] @@ -83,12 +83,12 @@ impl Response { let pattern = format!("(?i)^{}:\\s*(.+?)\\s*$", preg_quote(name, None)); for header in headers { let mut matches: indexmap::IndexMap< - shirabe_external_packages::composer::pcre::preg::CaptureKey, + shirabe_external_packages::composer::pcre::CaptureKey, String, > = indexmap::IndexMap::new(); if Preg::match3(&pattern, header, Some(&mut matches)).unwrap_or(false) { - if let Some(s) = matches - .get(&shirabe_external_packages::composer::pcre::preg::CaptureKey::ByIndex(1)) + if let Some(s) = + matches.get(&shirabe_external_packages::composer::pcre::CaptureKey::ByIndex(1)) { value = Some(s.clone()); } diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs index b57626d..8c8b8ef 100644 --- a/crates/shirabe/src/util/http_downloader.rs +++ b/crates/shirabe/src/util/http_downloader.rs @@ -3,29 +3,29 @@ use anyhow::Result; use indexmap::IndexMap; -use crate::util::silencer::Silencer; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise::Promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use crate::util::Silencer; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::Promise; +use shirabe_external_packages::react::promise::PromiseInterface; use shirabe_php_shim::{ InvalidArgumentException, LogicException, PhpMixed, array_replace_recursive, chr, extension_loaded, file_get_contents, function_exists, implode, is_numeric, max, min, rawurldecode, stream_context_create, stripos, strpos, substr, ucfirst, }; -use shirabe_semver::constraint::constraint::Constraint; +use shirabe_semver::constraint::Constraint; use crate::composer::Composer; use crate::config::Config; -use crate::downloader::transport_exception::TransportException; -use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException; -use crate::io::io_interface::IOInterface; -use crate::package::version::version_parser::VersionParser; -use crate::util::http::curl_downloader::CurlDownloader; -use crate::util::http::response::Response; -use crate::util::platform::Platform; -use crate::util::remote_filesystem::RemoteFilesystem; -use crate::util::stream_context_factory::StreamContextFactory; -use crate::util::url::Url; +use crate::downloader::TransportException; +use crate::exception::IrrecoverableDownloadException; +use crate::io::IOInterface; +use crate::package::version::VersionParser; +use crate::util::Platform; +use crate::util::RemoteFilesystem; +use crate::util::StreamContextFactory; +use crate::util::Url; +use crate::util::http::CurlDownloader; +use crate::util::http::Response; /// @phpstan-type Request array{url: non-empty-string, options: mixed[], copyTo: string|null} /// @phpstan-type Job array{id: int, status: int, request: Request, sync: bool, origin: string, resolve?: callable, reject?: callable, curl_id?: int, response?: Response, exception?: \Throwable} diff --git a/crates/shirabe/src/util/ini_helper.rs b/crates/shirabe/src/util/ini_helper.rs index e09b94f..a0f3fd5 100644 --- a/crates/shirabe/src/util/ini_helper.rs +++ b/crates/shirabe/src/util/ini_helper.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Util/IniHelper.php -use shirabe_external_packages::composer::xdebug_handler::xdebug_handler::XdebugHandler; +use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; pub struct IniHelper; diff --git a/crates/shirabe/src/util/loop.rs b/crates/shirabe/src/util/loop.rs index 9f8493b..1463d5e 100644 --- a/crates/shirabe/src/util/loop.rs +++ b/crates/shirabe/src/util/loop.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Util/Loop.php -use crate::util::http_downloader::HttpDownloader; -use crate::util::process_executor::ProcessExecutor; +use crate::util::HttpDownloader; +use crate::util::ProcessExecutor; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::console::helper::progress_bar::ProgressBar; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::console::helper::ProgressBar; use shirabe_php_shim::microtime; pub struct Loop { diff --git a/crates/shirabe/src/util/mod.rs b/crates/shirabe/src/util/mod.rs index 6a2d55e..633928b 100644 --- a/crates/shirabe/src/util/mod.rs +++ b/crates/shirabe/src/util/mod.rs @@ -31,3 +31,36 @@ pub mod tar; pub mod tls_helper; pub mod url; pub mod zip; + +pub use auth_helper::*; +pub use bitbucket::*; +pub use composer_mirror::*; +pub use config_validator::*; +pub use error_handler::*; +pub use filesystem::*; +pub use forgejo::*; +pub use forgejo_repository_data::*; +pub use forgejo_url::*; +pub use git::*; +pub use github::*; +pub use gitlab::*; +pub use hg::*; +pub use http::*; +pub use http_downloader::*; +pub use ini_helper::*; +pub use metadata_minifier::*; +pub use no_proxy_pattern::*; +pub use package_info::*; +pub use package_sorter::*; +pub use perforce::*; +pub use platform::*; +pub use process_executor::*; +pub use remote_filesystem::*; +pub use silencer::*; +pub use stream_context_factory::*; +pub use svn::*; +pub use sync_helper::*; +pub use tar::*; +pub use tls_helper::*; +pub use url::*; +pub use zip::*; diff --git a/crates/shirabe/src/util/no_proxy_pattern.rs b/crates/shirabe/src/util/no_proxy_pattern.rs index 2b593c3..dbca5d7 100644 --- a/crates/shirabe/src/util/no_proxy_pattern.rs +++ b/crates/shirabe/src/util/no_proxy_pattern.rs @@ -2,7 +2,7 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ FILTER_VALIDATE_INT, FILTER_VALIDATE_IP, PHP_URL_HOST, PHP_URL_PORT, PHP_URL_SCHEME, PhpMixed, RuntimeException, array_key_exists, chr, empty, explode, filter_var, filter_var_with_options, diff --git a/crates/shirabe/src/util/package_info.rs b/crates/shirabe/src/util/package_info.rs index d8d93ef..6660404 100644 --- a/crates/shirabe/src/util/package_info.rs +++ b/crates/shirabe/src/util/package_info.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Util/PackageInfo.php -use crate::package::complete_package_interface::CompletePackageInterface; -use crate::package::package_interface::PackageInterface; +use crate::package::CompletePackageInterface; +use crate::package::PackageInterface; pub struct PackageInfo; diff --git a/crates/shirabe/src/util/package_sorter.rs b/crates/shirabe/src/util/package_sorter.rs index a2728b5..185f595 100644 --- a/crates/shirabe/src/util/package_sorter.rs +++ b/crates/shirabe/src/util/package_sorter.rs @@ -5,9 +5,9 @@ use std::any::Any; use indexmap::IndexMap; use shirabe_php_shim::{strnatcasecmp, version_compare}; -use crate::package::link::Link; -use crate::package::package_interface::PackageInterface; -use crate::package::root_package::RootPackage; +use crate::package::Link; +use crate::package::PackageInterface; +use crate::package::RootPackage; pub struct PackageSorter; diff --git a/crates/shirabe/src/util/perforce.rs b/crates/shirabe/src/util/perforce.rs index 0182437..9c68cc9 100644 --- a/crates/shirabe/src/util/perforce.rs +++ b/crates/shirabe/src/util/perforce.rs @@ -2,19 +2,19 @@ use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::Preg; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::Preg; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ Exception, PHP_EOL, PhpMixed, chdir, count, date, explode, fclose, feof, fgets, file_get_contents, fopen, fwrite, gethostname, json_decode, str_replace_array, strcmp, strlen, strpos, strrpos, substr, time, trim, }; -use crate::io::io_interface::IOInterface; -use crate::util::filesystem::Filesystem; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::ProcessExecutor; /// @phpstan-type RepoConfig array{unique_perforce_client_name?: string, depot?: string, branch?: string, p4user?: string, p4password?: string} #[derive(Debug)] diff --git a/crates/shirabe/src/util/platform.rs b/crates/shirabe/src/util/platform.rs index 64b3ae7..541fd56 100644 --- a/crates/shirabe/src/util/platform.rs +++ b/crates/shirabe/src/util/platform.rs @@ -3,7 +3,7 @@ use std::sync::Mutex; use anyhow::Result; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ PhpMixed, RuntimeException, defined, env_contains_key, env_get, env_set, env_unset, file_exists, file_get_contents, fopen, fstat, function_exists, getcwd, getenv, in_array, @@ -12,8 +12,8 @@ use shirabe_php_shim::{ server_unset, stream_isatty, stripos, strlen, strtoupper, substr, usleep, }; -use crate::util::process_executor::ProcessExecutor; -use crate::util::silencer::Silencer; +use crate::util::ProcessExecutor; +use crate::util::Silencer; /// Platform helper for uniform platform-specific tests. pub struct Platform; @@ -92,7 +92,7 @@ impl Platform { /// Parses tildes and environment variables in paths. pub fn expand_path(path: &str) -> String { - use shirabe_external_packages::composer::pcre::preg::CaptureKey; + use shirabe_external_packages::composer::pcre::CaptureKey; if Preg::is_match(r"#^~[\\/]#", path).unwrap_or(false) { return format!( "{}{}", diff --git a/crates/shirabe/src/util/process_executor.rs b/crates/shirabe/src/util/process_executor.rs index 41cb9f1..cd25fbc 100644 --- a/crates/shirabe/src/util/process_executor.rs +++ b/crates/shirabe/src/util/process_executor.rs @@ -5,14 +5,14 @@ use anyhow::Result; use indexmap::IndexMap; use std::sync::{LazyLock, Mutex}; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise::Promise; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::seld::signal::signal_handler::SignalHandler; -use shirabe_external_packages::symfony::component::process::exception::process_signaled_exception::ProcessSignaledException; -use shirabe_external_packages::symfony::component::process::exception::runtime_exception::RuntimeException as SymfonyProcessRuntimeException; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::Promise; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::seld::signal::SignalHandler; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::Process; +use shirabe_external_packages::symfony::component::process::exception::ProcessSignaledException; +use shirabe_external_packages::symfony::component::process::exception::RuntimeException as SymfonyProcessRuntimeException; use shirabe_php_shim::{ LogicException, PhpMixed, RuntimeException, array_intersect, array_map, call_user_func, defined, escapeshellarg, explode, implode, in_array, is_array, is_callable, is_dir, is_numeric, @@ -20,9 +20,9 @@ use shirabe_php_shim::{ substr_replace, trim, usleep, }; -use crate::io::io_interface::IOInterface; -use crate::util::github::GitHub; -use crate::util::platform::Platform; +use crate::io::IOInterface; +use crate::util::GitHub; +use crate::util::Platform; static EXECUTABLES: LazyLock<Mutex<IndexMap<String, String>>> = LazyLock::new(|| Mutex::new(IndexMap::new())); diff --git a/crates/shirabe/src/util/remote_filesystem.rs b/crates/shirabe/src/util/remote_filesystem.rs index 0ad5ff3..2e77fe8 100644 --- a/crates/shirabe/src/util/remote_filesystem.rs +++ b/crates/shirabe/src/util/remote_filesystem.rs @@ -2,7 +2,7 @@ use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ FILTER_VALIDATE_BOOLEAN, PHP_URL_HOST, PHP_URL_PATH, PHP_VERSION_ID, PhpMixed, RuntimeException, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_PROGRESS, @@ -13,16 +13,16 @@ use shirabe_php_shim::{ }; use crate::config::Config; -use crate::downloader::max_file_size_exceeded_exception::MaxFileSizeExceededException; -use crate::downloader::transport_exception::TransportException; -use crate::io::io_interface::IOInterface; -use crate::util::auth_helper::AuthHelper; -use crate::util::http::proxy_manager::ProxyManager; -use crate::util::http::response::Response; -use crate::util::http_downloader::HttpDownloader; -use crate::util::platform::Platform; -use crate::util::stream_context_factory::StreamContextFactory; -use crate::util::url::Url; +use crate::downloader::MaxFileSizeExceededException; +use crate::downloader::TransportException; +use crate::io::IOInterface; +use crate::util::AuthHelper; +use crate::util::HttpDownloader; +use crate::util::Platform; +use crate::util::StreamContextFactory; +use crate::util::Url; +use crate::util::http::ProxyManager; +use crate::util::http::Response; /// Result of `RemoteFilesystem::get` — string content, `true` (for copy), or `false`. #[derive(Debug, Clone)] @@ -283,7 +283,7 @@ impl RemoteFilesystem { using_proxy ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); if (!Preg::is_match("{^http://(repo\\.)?packagist\\.org/p/}", &file_url).unwrap_or(false) @@ -301,7 +301,7 @@ impl RemoteFilesystem { self.io.write_error3( "Downloading (<comment>connecting...</comment>)", false, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -383,7 +383,7 @@ impl RemoteFilesystem { base64_encode(result.as_deref().unwrap_or("")) ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); return Err(anyhow::anyhow!(e)); @@ -426,8 +426,7 @@ impl RemoteFilesystem { let msg_owned = format!("{}", e); if !self.degraded_mode && strpos(&msg_owned, "Operation timed out").is_some() { self.degraded_mode = true; - self.io - .write_error3("", true, crate::io::io_interface::NORMAL); + self.io.write_error3("", true, crate::io::NORMAL); // TODO(phase-b): PHP writeError accepts an array of lines; joined here with newline. self.io.write_error3( &format!( @@ -435,7 +434,7 @@ impl RemoteFilesystem { msg_owned, ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); return self.get( @@ -523,7 +522,7 @@ impl RemoteFilesystem { "Downloading (<error>failed</error>)", false, None, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -558,7 +557,7 @@ impl RemoteFilesystem { ), false, None, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } @@ -584,7 +583,7 @@ impl RemoteFilesystem { e, ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); return self.get( @@ -644,7 +643,7 @@ impl RemoteFilesystem { if self.store_auth { let _ = self.auth_helper.store_auth( &self.origin_url, - crate::util::auth_helper::StoreAuth::Bool(self.store_auth), + crate::util::StoreAuth::Bool(self.store_auth), ); self.store_auth = false; } @@ -667,8 +666,7 @@ impl RemoteFilesystem { let msg_owned = format!("{}", e); if !self.degraded_mode && strpos(&msg_owned, "Operation timed out").is_some() { self.degraded_mode = true; - self.io - .write_error3("", true, crate::io::io_interface::NORMAL); + self.io.write_error3("", true, crate::io::NORMAL); // TODO(phase-b): PHP writeError accepts an array of lines; joined here with newline. self.io.write_error3( &format!( @@ -676,7 +674,7 @@ impl RemoteFilesystem { msg_owned, ), true, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); return self.get( @@ -797,7 +795,7 @@ impl RemoteFilesystem { &format!("Downloading (<comment>{}%</comment>)", progression), false, None, - crate::io::io_interface::NORMAL, + crate::io::NORMAL, ); } } @@ -827,8 +825,7 @@ impl RemoteFilesystem { self.store_auth = matches!( result.store_auth, - crate::util::auth_helper::StoreAuth::Bool(true) - | crate::util::auth_helper::StoreAuth::Prompt + crate::util::StoreAuth::Bool(true) | crate::util::StoreAuth::Prompt ); self.retry = result.retry; @@ -973,8 +970,7 @@ impl RemoteFilesystem { if let Some(target_url) = target_url { self.redirects += 1; - self.io - .write_error3("", true, crate::io::io_interface::DEBUG); + self.io.write_error3("", true, crate::io::DEBUG); self.io.write_error3( &sprintf( "Following redirect (%u) %s", @@ -984,7 +980,7 @@ impl RemoteFilesystem { ], ), true, - crate::io::io_interface::DEBUG, + crate::io::DEBUG, ); additional_options.insert("redirects".to_string(), PhpMixed::Int(self.redirects)); diff --git a/crates/shirabe/src/util/stream_context_factory.rs b/crates/shirabe/src/util/stream_context_factory.rs index 783d47a..bb1948e 100644 --- a/crates/shirabe/src/util/stream_context_factory.rs +++ b/crates/shirabe/src/util/stream_context_factory.rs @@ -1,8 +1,8 @@ //! ref: composer/src/Composer/Util/StreamContextFactory.php use indexmap::IndexMap; -use shirabe_external_packages::composer::ca_bundle::ca_bundle::CaBundle; -use shirabe_external_packages::psr::log::logger_interface::LoggerInterface; +use shirabe_external_packages::composer::ca_bundle::CaBundle; +use shirabe_external_packages::psr::log::LoggerInterface; use shirabe_php_shim::{ HHVM_VERSION, PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PhpMixed, RuntimeException, array_replace_recursive, curl_version, extension_loaded, function_exists, @@ -10,11 +10,11 @@ use shirabe_php_shim::{ }; use crate::composer::Composer; -use crate::downloader::transport_exception::TransportException; -use crate::repository::platform_repository::PlatformRepository; -use crate::util::filesystem::Filesystem; -use crate::util::http::proxy_manager::ProxyManager; -use crate::util::platform::Platform; +use crate::downloader::TransportException; +use crate::repository::PlatformRepository; +use crate::util::Filesystem; +use crate::util::Platform; +use crate::util::http::ProxyManager; pub struct StreamContextFactory; diff --git a/crates/shirabe/src/util/svn.rs b/crates/shirabe/src/util/svn.rs index 15809df..aa81f0f 100644 --- a/crates/shirabe/src/util/svn.rs +++ b/crates/shirabe/src/util/svn.rs @@ -5,16 +5,16 @@ use std::sync::Mutex; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ LogicException, PHP_URL_HOST, PhpMixed, RuntimeException, empty, implode, parse_url, parse_url_all, stripos, strpos, trim, }; use crate::config::Config; -use crate::io::io_interface::IOInterface; -use crate::util::platform::Platform; -use crate::util::process_executor::ProcessExecutor; +use crate::io::IOInterface; +use crate::util::Platform; +use crate::util::ProcessExecutor; #[derive(Debug, Clone)] pub struct SvnCredentials { diff --git a/crates/shirabe/src/util/sync_helper.rs b/crates/shirabe/src/util/sync_helper.rs index 7d69db3..f22b532 100644 --- a/crates/shirabe/src/util/sync_helper.rs +++ b/crates/shirabe/src/util/sync_helper.rs @@ -1,11 +1,11 @@ //! ref: composer/src/Composer/Util/SyncHelper.php -use crate::downloader::download_manager::DownloadManager; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::package::package_interface::PackageInterface; +use crate::downloader::DownloadManager; +use crate::downloader::DownloaderInterface; +use crate::package::PackageInterface; use crate::util::r#loop::Loop; use anyhow::Result; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; +use shirabe_external_packages::react::promise::PromiseInterface; pub enum DownloaderOrManager<'a> { Interface(&'a dyn DownloaderInterface), diff --git a/crates/shirabe/src/util/tls_helper.rs b/crates/shirabe/src/util/tls_helper.rs index 21b53a4..0c20dd4 100644 --- a/crates/shirabe/src/util/tls_helper.rs +++ b/crates/shirabe/src/util/tls_helper.rs @@ -1,7 +1,7 @@ //! ref: composer/src/Composer/Util/TlsHelper.php -use shirabe_external_packages::composer::ca_bundle::ca_bundle::CaBundle; -use shirabe_external_packages::composer::pcre::preg::Preg; +use shirabe_external_packages::composer::ca_bundle::CaBundle; +use shirabe_external_packages::composer::pcre::Preg; use shirabe_php_shim::{ PhpMixed, RuntimeException, base64_decode, openssl_get_publickey, openssl_pkey_get_details, openssl_x509_parse, preg_quote, substr_count, diff --git a/crates/shirabe/src/util/url.rs b/crates/shirabe/src/util/url.rs index 9ee5dc9..a6736aa 100644 --- a/crates/shirabe/src/util/url.rs +++ b/crates/shirabe/src/util/url.rs @@ -1,9 +1,9 @@ //! ref: composer/src/Composer/Util/Url.php use crate::config::Config; -use crate::util::github::GitHub; +use crate::util::GitHub; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; use shirabe_php_shim::{PHP_URL_HOST, PHP_URL_PORT, PhpMixed, in_array, parse_url}; pub struct Url; |