From 0b06f54103490e3ce5658e82bbc0119633e26cd8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 22 May 2026 01:29:48 +0900 Subject: refactor(composer): unify Composer/PartialComposer via Rc handles Model PHP's `Composer extends PartialComposer` as a PartialOrFullComposer enum and merge partial_composer.rs into composer.rs. Introduce ComposerHandle / PartialComposerHandle (plus their Weak variants) so the graph can be shared, and build it at once with Rc::new_cyclic in the factory to resolve the back-reference cycles. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/command/reinstall_command.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/command/reinstall_command.rs') diff --git a/crates/shirabe/src/command/reinstall_command.rs b/crates/shirabe/src/command/reinstall_command.rs index 3e985a4..8bb4643 100644 --- a/crates/shirabe/src/command/reinstall_command.rs +++ b/crates/shirabe/src/command/reinstall_command.rs @@ -9,7 +9,6 @@ use shirabe_external_packages::symfony::component::console::output::OutputInterf use shirabe_php_shim::InvalidArgumentException; use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::Composer; use crate::console::input::InputArgument; use crate::console::input::InputDefinitionItem; use crate::console::input::InputOption; @@ -68,9 +67,12 @@ impl ReinstallCommand { output: &dyn OutputInterface, ) -> Result { let composer = self.require_composer(None, None)?; + let composer = crate::command::composer_full(&composer); let io = self.get_io(); - let local_repo = composer.get_repository_manager().get_local_repository(); + let repository_manager = composer.get_repository_manager().clone(); + let repository_manager = repository_manager.borrow(); + let local_repo = repository_manager.get_local_repository(); let mut packages_to_reinstall: Vec> = vec![]; let mut package_names_to_reinstall: Vec = vec![]; @@ -193,11 +195,11 @@ impl ReinstallCommand { .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let config = std::rc::Rc::clone(composer.get_config()); + let config = composer.get_config(); let (prefer_source, prefer_dist) = self.get_preferred_install_options(&*config.borrow(), input, false)?; - let installation_manager = composer.get_installation_manager(); + let installation_manager = composer.get_installation_manager().clone(); let download_manager = composer.get_download_manager(); let package = composer.get_package(); -- cgit v1.3.1