fix(shirabe): correct invalid import paths and add missing dependency

13 files changed, 17 insertions, 15 deletions

diff --git a/crates/shirabe/Cargo.toml b/crates/shirabe/Cargo.toml
index b41c839..77962f2 100644
--- a/crates/shirabe/Cargo.toml
+++ b/crates/shirabe/Cargo.toml
@@ -4,6 +4,7 @@ version.workspace = true
 edition.workspace = true
 
 [dependencies]
+shirabe-class-map-generator.workspace = true
 shirabe-external-packages.workspace = true
 shirabe-php-shim.workspace = true
 shirabe-semver.workspace = true
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index b1c8e83..867b010 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -27,7 +27,7 @@ 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::loop_::Loop;
+use crate::util::r#loop::Loop;
 use crate::util::platform::Platform;
 use crate::util::process_executor::ProcessExecutor;
 
diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs
index cbf85c0..09624af 100644
--- a/crates/shirabe/src/command/run_script_command.rs
+++ b/crates/shirabe/src/command/run_script_command.rs
@@ -8,7 +8,7 @@ use shirabe_php_shim::{InvalidArgumentException, PhpMixed, RuntimeException};
 use crate::command::base_command::BaseCommand;
 use crate::console::input::input_argument::InputArgument;
 use crate::console::input::input_option::InputOption;
-use crate::script::event::ScriptEvent;
+use crate::script::event::Event as ScriptEvent;
 use crate::script::script_events::ScriptEvents;
 use crate::util::platform::Platform;
 use crate::util::process_executor::ProcessExecutor;
diff --git a/crates/shirabe/src/command/search_command.rs b/crates/shirabe/src/command/search_command.rs
index 2c727e5..2e9de04 100644
--- a/crates/shirabe/src/command/search_command.rs
+++ b/crates/shirabe/src/command/search_command.rs
@@ -10,6 +10,7 @@ use crate::repository::composite_repository::CompositeRepository;
 use crate::repository::platform_repository::PlatformRepository;
 use crate::repository::repository_interface::RepositoryInterface;
 use anyhow::Result;
+use indexmap::IndexMap;
 use shirabe_external_packages::symfony::console::formatter::output_formatter::OutputFormatter;
 use shirabe_external_packages::symfony::console::input::input_interface::InputInterface;
 use shirabe_external_packages::symfony::console::output::output_interface::OutputInterface;
@@ -44,7 +45,7 @@ impl SearchCommand {
         input: &dyn InputInterface,
         output: &dyn OutputInterface,
     ) -> Result<i64> {
-        let platform_repo = PlatformRepository;
+        let platform_repo = PlatformRepository::new(vec![], IndexMap::new(), None, None)?;
         let io = self.inner.get_io();
 
         let format = input
diff --git a/crates/shirabe/src/config/json_config_source.rs b/crates/shirabe/src/config/json_config_source.rs
index 4575123..675f327 100644
--- a/crates/shirabe/src/config/json_config_source.rs
+++ b/crates/shirabe/src/config/json_config_source.rs
@@ -1,12 +1,12 @@
 //! ref: composer/src/Composer/Config/JsonConfigSource.php
 
+use crate::util::silencer::Silencer;
 use anyhow::Result;
 use indexmap::IndexMap;
 use shirabe_php_shim::{
     PHP_EOL, PhpMixed, RuntimeException, array_unshift, call_user_func_array, chmod, explode,
     file_get_contents, file_put_contents, implode, is_writable, sprintf,
 };
-use crate::util::silencer::Silencer;
 
 use crate::config::config_source_interface::ConfigSourceInterface;
 use crate::json::json_file::JsonFile;
diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs
index ff453f3..83ba219 100644
--- a/crates/shirabe/src/downloader/download_manager.rs
+++ b/crates/shirabe/src/downloader/download_manager.rs
@@ -11,7 +11,7 @@ use shirabe_php_shim::{
 };
 
 use crate::downloader::downloader_interface::DownloaderInterface;
-use crate::downloader::irrecoverable_download_exception::IrrecoverableDownloadException;
+use crate::exception::irrecoverable_download_exception::IrrecoverableDownloadException;
 use crate::io::io_interface::IOInterface;
 use crate::package::package_interface::PackageInterface;
 use crate::util::filesystem::Filesystem;
diff --git a/crates/shirabe/src/downloader/file_downloader.rs b/crates/shirabe/src/downloader/file_downloader.rs
index 47c216a..cee4a3f 100644
--- a/crates/shirabe/src/downloader/file_downloader.rs
+++ b/crates/shirabe/src/downloader/file_downloader.rs
@@ -4,6 +4,7 @@ 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 shirabe_external_packages::react::promise::resolve as react_promise_resolve;
 use shirabe_php_shim::{
@@ -12,7 +13,6 @@ use shirabe_php_shim::{
     file_exists, filesize, get_class, hash, hash_file, in_array, is_dir, is_executable, parse_url,
     pathinfo, realpath, rtrim, spl_object_hash, strlen, strpos, strtr, trim, umask, usleep,
 };
-use crate::util::silencer::Silencer;
 
 use crate::cache::Cache;
 use crate::config::Config;
diff --git a/crates/shirabe/src/factory.rs b/crates/shirabe/src/factory.rs
index eee2b88..42d31d1 100644
--- a/crates/shirabe/src/factory.rs
+++ b/crates/shirabe/src/factory.rs
@@ -14,6 +14,7 @@ use shirabe_php_shim::{
 };
 
 use crate::autoload::autoload_generator::AutoloadGenerator;
+use crate::cache::Cache;
 use crate::composer::Composer;
 use crate::config::Config;
 use crate::config::json_config_source::JsonConfigSource;
@@ -59,7 +60,6 @@ use crate::repository::installed_filesystem_repository::InstalledFilesystemRepos
 use crate::repository::installed_repository_interface::InstalledRepositoryInterface;
 use crate::repository::repository_factory::RepositoryFactory;
 use crate::repository::repository_manager::RepositoryManager;
-use crate::util::cache::Cache;
 use crate::util::filesystem::Filesystem;
 use crate::util::http_downloader::HttpDownloader;
 use crate::util::r#loop::Loop;
diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs
index 519091f..3362d86 100644
--- a/crates/shirabe/src/installer/installation_manager.rs
+++ b/crates/shirabe/src/installer/installation_manager.rs
@@ -27,7 +27,7 @@ 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::util::loop_::Loop;
+use crate::util::r#loop::Loop;
 use crate::util::platform::Platform;
 
 /// Package operation manager.
diff --git a/crates/shirabe/src/json/json_file.rs b/crates/shirabe/src/json/json_file.rs
index 92c3428..89cfbb1 100644
--- a/crates/shirabe/src/json/json_file.rs
+++ b/crates/shirabe/src/json/json_file.rs
@@ -1,5 +1,6 @@
 //! ref: composer/src/Composer/Json/JsonFile.php
 
+use crate::util::silencer::Silencer;
 use anyhow::Result;
 use shirabe_external_packages::composer::pcre::preg::Preg;
 use shirabe_external_packages::json_schema::validator::Validator;
@@ -9,11 +10,10 @@ 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,
     JSON_UNESCAPED_UNICODE, PhpMixed, RuntimeException, UnexpectedValueException, defined, dirname,
-    file_exists, file_get_contents, file_put_contents, is_dir, is_file, json_decode, json_encode_ex,
-    json_last_error, mkdir, php_dir, realpath, str_contains, str_ends_with, str_repeat, strlen,
-    strpos, usleep,
+    file_exists, file_get_contents, file_put_contents, is_dir, is_file, json_decode,
+    json_encode_ex, json_last_error, mkdir, php_dir, realpath, str_contains, str_ends_with,
+    str_repeat, strlen, strpos, usleep,
 };
-use crate::util::silencer::Silencer;
 
 use crate::downloader::transport_exception::TransportException;
 use crate::io::io_interface::IOInterface;
diff --git a/crates/shirabe/src/repository/filesystem_repository.rs b/crates/shirabe/src/repository/filesystem_repository.rs
index 374c8e9..0acc3b6 100644
--- a/crates/shirabe/src/repository/filesystem_repository.rs
+++ b/crates/shirabe/src/repository/filesystem_repository.rs
@@ -2,6 +2,7 @@
 
 use std::any::Any;
 
+use crate::util::silencer::Silencer;
 use anyhow::Result;
 use indexmap::IndexMap;
 use shirabe_external_packages::composer::pcre::preg::Preg;
@@ -11,7 +12,6 @@ use shirabe_php_shim::{
     is_int, is_null, is_string, ksort, php_dir, realpath, sort, sort_with_flags, str_repeat, strtr,
     trim, usort, var_export,
 };
-use crate::util::silencer::Silencer;
 
 use crate::installed_versions::InstalledVersions;
 use crate::installer::installation_manager::InstallationManager;
diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs
index 5786da3..34f0642 100644
--- a/crates/shirabe/src/util/http_downloader.rs
+++ b/crates/shirabe/src/util/http_downloader.rs
@@ -3,6 +3,7 @@
 use anyhow::Result;
 use indexmap::IndexMap;
 
+use crate::util::silencer::Silencer;
 use shirabe_external_packages::composer::pcre::preg::Preg;
 use shirabe_external_packages::react::promise::promise::Promise;
 use shirabe_external_packages::react::promise::promise_interface::PromiseInterface;
@@ -11,7 +12,6 @@ use shirabe_php_shim::{
     extension_loaded, file_get_contents, function_exists, implode, is_numeric, max, min,
     rawurldecode, stream_context_create, stripos, strpos, substr, ucfirst,
 };
-use crate::util::silencer::Silencer;
 use shirabe_semver::constraint::constraint::Constraint;
 
 use crate::composer::Composer;
diff --git a/crates/shirabe/src/util/remote_filesystem.rs b/crates/shirabe/src/util/remote_filesystem.rs
index 14b771d..0674df4 100644
--- a/crates/shirabe/src/util/remote_filesystem.rs
+++ b/crates/shirabe/src/util/remote_filesystem.rs
@@ -11,13 +11,13 @@ use shirabe_php_shim::{
 };
 
 use crate::config::Config;
-use crate::downloader::http_downloader::HttpDownloader;
 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;