aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-27 08:44:57 +0900
committernsfisis <nsfisis@gmail.com>2026-06-27 08:44:57 +0900
commit901878ee3f2bee6605b02d321cc4c92bc32fd5b0 (patch)
tree83d8c8c9a24cb95c0656866d328b87c2d4c5127f /crates/shirabe/src/command
parent5c2c72223cb6b4d77a332eeeeff7ee4e82e3f239 (diff)
downloadphp-shirabe-901878ee3f2bee6605b02d321cc4c92bc32fd5b0.tar.gz
php-shirabe-901878ee3f2bee6605b02d321cc4c92bc32fd5b0.tar.zst
php-shirabe-901878ee3f2bee6605b02d321cc4c92bc32fd5b0.zip
refactor(composer): hold managers behind *Interface traits
Composer/PartialComposer exposed its RepositoryManager, InstallationManager, EventDispatcher, Locker, DownloadManager, AutoloadGenerator and ArchiveManager as concrete types, but Composer's public setters (setDownloadManager() etc.) let plugins swap in subclasses. Introduce a *Interface trait per manager and store each as Rc<RefCell<dyn ...Interface>> so a replacement is honored. Only Composer's slots and the sinks fed from its accessors become trait objects; managers injected concretely at construction keep their concrete references, matching PHP semantics. Fluent setters on the affected classes now return () and Locker::update_hash is de-generified to a boxed FnOnce so the traits stay object-safe. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/command')
-rw-r--r--crates/shirabe/src/command/archive_command.rs53
-rw-r--r--crates/shirabe/src/command/base_dependency_command.rs2
-rw-r--r--crates/shirabe/src/command/bump_command.rs2
-rw-r--r--crates/shirabe/src/command/create_project_command.rs7
-rw-r--r--crates/shirabe/src/command/diagnose_command.rs6
-rw-r--r--crates/shirabe/src/command/dump_autoload_command.rs2
6 files changed, 36 insertions, 36 deletions
diff --git a/crates/shirabe/src/command/archive_command.rs b/crates/shirabe/src/command/archive_command.rs
index c2e9070..9aae885 100644
--- a/crates/shirabe/src/command/archive_command.rs
+++ b/crates/shirabe/src/command/archive_command.rs
@@ -19,7 +19,7 @@ use crate::console::input::InputOption;
use crate::factory::Factory;
use crate::io::IOInterface;
use crate::io::IOInterfaceImmutable;
-use crate::package::archiver::ArchiveManager;
+use crate::package::archiver::ArchiveManagerInterface;
use crate::package::version::VersionParser;
use crate::package::version::VersionSelector;
use crate::plugin::CommandEvent;
@@ -222,31 +222,32 @@ impl ArchiveCommand {
let mut owned_archive_manager;
let composer_archive_manager;
let mut composer_archive_manager_ref;
- let archive_manager: &mut ArchiveManager = if let Some(composer) = &composer_guard {
- composer_archive_manager = composer.get_archive_manager().clone();
- composer_archive_manager_ref = composer_archive_manager.borrow_mut();
- &mut composer_archive_manager_ref
- } else {
- let factory = Factory;
- let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None)));
- let http_downloader = std::rc::Rc::new(std::cell::RefCell::new(
- Factory::create_http_downloader(io.clone(), config, indexmap::IndexMap::new())?,
- ));
- let download_manager = factory.create_download_manager(
- io.clone(),
- config,
- &http_downloader,
- &process,
- None,
- )?;
- let loop_ = std::rc::Rc::new(std::cell::RefCell::new(Loop::new(
- http_downloader.clone(),
- Some(process),
- )));
- owned_archive_manager =
- factory.create_archive_manager(&config.borrow(), &download_manager, &loop_)?;
- &mut owned_archive_manager
- };
+ let archive_manager: &mut dyn ArchiveManagerInterface =
+ if let Some(composer) = &composer_guard {
+ composer_archive_manager = composer.get_archive_manager().clone();
+ composer_archive_manager_ref = composer_archive_manager.borrow_mut();
+ &mut *composer_archive_manager_ref
+ } else {
+ let factory = Factory;
+ let process = std::rc::Rc::new(std::cell::RefCell::new(ProcessExecutor::new(None)));
+ let http_downloader = std::rc::Rc::new(std::cell::RefCell::new(
+ Factory::create_http_downloader(io.clone(), config, indexmap::IndexMap::new())?,
+ ));
+ let download_manager = factory.create_download_manager(
+ io.clone(),
+ config,
+ &http_downloader,
+ &process,
+ None,
+ )?;
+ let loop_ = std::rc::Rc::new(std::cell::RefCell::new(Loop::new(
+ http_downloader.clone(),
+ Some(process),
+ )));
+ owned_archive_manager =
+ factory.create_archive_manager(&config.borrow(), &download_manager, &loop_)?;
+ &mut owned_archive_manager
+ };
let package: crate::package::CompletePackageInterfaceHandle =
if let Some(name) = package_name {
diff --git a/crates/shirabe/src/command/base_dependency_command.rs b/crates/shirabe/src/command/base_dependency_command.rs
index 8404dec..1c48a06 100644
--- a/crates/shirabe/src/command/base_dependency_command.rs
+++ b/crates/shirabe/src/command/base_dependency_command.rs
@@ -152,7 +152,7 @@ pub trait BaseDependencyCommand: BaseCommand {
RepositoryFactory::default_repos(
Some(self.get_io()),
Some(composer.get_config()),
- Some(&mut rm.borrow_mut()),
+ Some(&mut *rm.borrow_mut()),
)?
.into_values()
.collect(),
diff --git a/crates/shirabe/src/command/bump_command.rs b/crates/shirabe/src/command/bump_command.rs
index f86b29a..3964300 100644
--- a/crates/shirabe/src/command/bump_command.rs
+++ b/crates/shirabe/src/command/bump_command.rs
@@ -285,7 +285,7 @@ impl BumpCommand {
composer
.get_locker()
.borrow_mut()
- .update_hash(&composer_json, None::<fn(_) -> _>)?;
+ .update_hash(&composer_json, None)?;
}
if dry_run && change_count > 0 {
diff --git a/crates/shirabe/src/command/create_project_command.rs b/crates/shirabe/src/command/create_project_command.rs
index ab45400..abbf37a 100644
--- a/crates/shirabe/src/command/create_project_command.rs
+++ b/crates/shirabe/src/command/create_project_command.rs
@@ -865,7 +865,7 @@ impl CreateProjectCommand {
RepositoryFactory::default_repos(
Some(io.clone()),
Some(config.clone()),
- Some(&mut rm.borrow_mut()),
+ Some(&mut *rm.borrow_mut()),
)?
.into_iter()
.map(|(_, v)| v)
@@ -998,9 +998,8 @@ impl CreateProjectCommand {
}
let dm = composer.get_download_manager();
- dm.borrow_mut()
- .set_prefer_source(prefer_source)
- .set_prefer_dist(prefer_dist);
+ dm.borrow_mut().set_prefer_source(prefer_source);
+ dm.borrow_mut().set_prefer_dist(prefer_dist);
let project_installer = ProjectInstaller::new(&directory, dm.clone(), fs.clone());
let installation_manager = composer.get_installation_manager().clone();
diff --git a/crates/shirabe/src/command/diagnose_command.rs b/crates/shirabe/src/command/diagnose_command.rs
index 37009fb..68aec20 100644
--- a/crates/shirabe/src/command/diagnose_command.rs
+++ b/crates/shirabe/src/command/diagnose_command.rs
@@ -34,7 +34,7 @@ use crate::io::IOInterfaceImmutable;
use crate::io::NullIO;
use crate::json::JsonFile;
use crate::json::JsonValidationException;
-use crate::package::Locker;
+use crate::package::LockerInterface;
use crate::package::RootPackage;
use crate::package::version::VersionParser;
use crate::plugin::CommandEvent;
@@ -284,7 +284,7 @@ impl Command for DiagnoseCommand {
io.write_no_newline("Checking composer.lock: ");
let locker = c.get_locker().clone();
let locker = locker.borrow();
- let r = self.check_composer_lock_schema(&locker)?;
+ let r = self.check_composer_lock_schema(&*locker)?;
self.output_result(r);
}
}
@@ -487,7 +487,7 @@ impl DiagnoseCommand {
Ok(PhpMixed::Bool(true))
}
- fn check_composer_lock_schema(&self, locker: &Locker) -> anyhow::Result<PhpMixed> {
+ fn check_composer_lock_schema(&self, locker: &dyn LockerInterface) -> anyhow::Result<PhpMixed> {
let json = locker.get_json_file();
match json.validate_schema(JsonFile::LOCK_SCHEMA, None) {
diff --git a/crates/shirabe/src/command/dump_autoload_command.rs b/crates/shirabe/src/command/dump_autoload_command.rs
index d9e9973..b0bb755 100644
--- a/crates/shirabe/src/command/dump_autoload_command.rs
+++ b/crates/shirabe/src/command/dump_autoload_command.rs
@@ -269,7 +269,7 @@ impl Command for DumpAutoloadCommand {
&config_ref,
local_repo,
package,
- &mut installation_manager_ref,
+ &mut *installation_manager_ref,
"composer",
optimize,
None,