From 901878ee3f2bee6605b02d321cc4c92bc32fd5b0 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 27 Jun 2026 08:44:57 +0900 Subject: 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> 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) --- crates/shirabe/src/command/archive_command.rs | 53 ++++++++++++++------------- 1 file changed, 27 insertions(+), 26 deletions(-) (limited to 'crates/shirabe/src/command/archive_command.rs') 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 { -- cgit v1.3.1