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) --- .../shirabe/src/repository/repository_factory.rs | 9 +++-- .../shirabe/src/repository/repository_manager.rs | 43 ++++++++++++++++++++++ crates/shirabe/src/repository/repository_set.rs | 4 +- 3 files changed, 50 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/repository') diff --git a/crates/shirabe/src/repository/repository_factory.rs b/crates/shirabe/src/repository/repository_factory.rs index db8185e..bc08589 100644 --- a/crates/shirabe/src/repository/repository_factory.rs +++ b/crates/shirabe/src/repository/repository_factory.rs @@ -15,6 +15,7 @@ use crate::json::JsonFile; use crate::repository::FilesystemRepository; use crate::repository::RepositoryInterfaceHandle; use crate::repository::RepositoryManager; +use crate::repository::RepositoryManagerInterface; use crate::util::HttpDownloader; use crate::util::ProcessExecutor; @@ -98,7 +99,7 @@ impl RepositoryFactory { config: &std::rc::Rc>, repository: &str, allow_filesystem: bool, - rm: Option<&mut RepositoryManager>, + rm: Option<&mut dyn RepositoryManagerInterface>, ) -> anyhow::Result { let repo_config = Self::config_from_string(io.clone(), config, repository, allow_filesystem)?; @@ -109,7 +110,7 @@ impl RepositoryFactory { io: std::rc::Rc>, config: &std::rc::Rc>, repo_config: IndexMap, - rm: Option<&mut RepositoryManager>, + rm: Option<&mut dyn RepositoryManagerInterface>, ) -> anyhow::Result { let mut owned_rm; let rm = if let Some(rm) = rm { @@ -134,7 +135,7 @@ impl RepositoryFactory { pub fn default_repos( io: Option>>, config: Option>>, - rm: Option<&mut RepositoryManager>, + rm: Option<&mut dyn RepositoryManagerInterface>, ) -> anyhow::Result> { let config = match config { Some(c) => c, @@ -235,7 +236,7 @@ impl RepositoryFactory { } fn create_repos( - rm: &mut RepositoryManager, + rm: &mut dyn RepositoryManagerInterface, repo_configs: Vec, ) -> anyhow::Result> { let mut repo_map: IndexMap = IndexMap::new(); diff --git a/crates/shirabe/src/repository/repository_manager.rs b/crates/shirabe/src/repository/repository_manager.rs index 247236c..41f4e7d 100644 --- a/crates/shirabe/src/repository/repository_manager.rs +++ b/crates/shirabe/src/repository/repository_manager.rs @@ -196,3 +196,46 @@ impl RepositoryManager { self.local_repository.clone().unwrap() } } + +// Composer's PartialComposer::setRepositoryManager() accepts any RepositoryManager subclass, so +// plugins may swap in a replacement. The interface captures the methods reached through Composer's +// accessor and through the `&mut RepositoryManager` parameters fed from it. +pub trait RepositoryManagerInterface: std::fmt::Debug { + fn get_local_repository(&self) -> RepositoryInterfaceHandle; + fn get_repositories(&self) -> &Vec; + fn create_repository( + &self, + r#type: &str, + config: IndexMap, + name: Option<&str>, + ) -> anyhow::Result; + fn add_repository(&mut self, repository: RepositoryInterfaceHandle); + fn set_local_repository(&mut self, repository: RepositoryInterfaceHandle); +} + +impl RepositoryManagerInterface for RepositoryManager { + fn get_local_repository(&self) -> RepositoryInterfaceHandle { + self.get_local_repository() + } + + fn get_repositories(&self) -> &Vec { + self.get_repositories() + } + + fn create_repository( + &self, + r#type: &str, + config: IndexMap, + name: Option<&str>, + ) -> anyhow::Result { + self.create_repository(r#type, config, name) + } + + fn add_repository(&mut self, repository: RepositoryInterfaceHandle) { + self.add_repository(repository); + } + + fn set_local_repository(&mut self, repository: RepositoryInterfaceHandle) { + self.set_local_repository(repository); + } +} diff --git a/crates/shirabe/src/repository/repository_set.rs b/crates/shirabe/src/repository/repository_set.rs index ba6373a..393639f 100644 --- a/crates/shirabe/src/repository/repository_set.rs +++ b/crates/shirabe/src/repository/repository_set.rs @@ -15,7 +15,7 @@ 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::event_dispatcher::EventDispatcherInterface; use crate::io::IOInterface; use crate::io::NullIO; use crate::package::AliasPackageHandle; @@ -451,7 +451,7 @@ impl RepositorySet { &mut self, request: &mut Request, io: std::rc::Rc>, - event_dispatcher: Option>>, + event_dispatcher: Option>>, pool_optimizer: Option, ignored_types: Vec, allowed_types: Option>, -- cgit v1.3.1