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) --- .../src/command/check_platform_reqs_command.rs | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/command/check_platform_reqs_command.rs') diff --git a/crates/shirabe/src/command/check_platform_reqs_command.rs b/crates/shirabe/src/command/check_platform_reqs_command.rs index 40bd898..83770be 100644 --- a/crates/shirabe/src/command/check_platform_reqs_command.rs +++ b/crates/shirabe/src/command/check_platform_reqs_command.rs @@ -9,7 +9,6 @@ use shirabe_semver::constraint::Constraint; use shirabe_semver::constraint::ConstraintInterface; use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::Composer; use crate::console::input::InputOption; use crate::io::IOInterface; use crate::json::JsonFile; @@ -54,7 +53,8 @@ impl CheckPlatformReqsCommand { input: &dyn InputInterface, _output: &dyn OutputInterface, ) -> Result { - let mut composer = self.require_composer(None, None)?; + let composer = self.require_composer(None, None)?; + let mut composer = crate::command::composer_full_mut(&composer); let io = self.get_io(); let no_dev = input.get_option("no-dev").as_bool().unwrap_or(false); @@ -71,16 +71,27 @@ impl CheckPlatformReqsCommand { "Checking {}platform requirements using the lock file", if no_dev { "non-dev " } else { "" } )); - Box::new(composer.get_locker_mut().get_locked_repository(!no_dev)?) + Box::new( + composer + .get_locker() + .borrow_mut() + .get_locked_repository(!no_dev)?, + ) } else { - 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(); if local_repo.get_packages().is_empty() { io.write_error(&format!( "No vendor dir present, checking {}platform requirements from the lock file", if no_dev { "non-dev " } else { "" } )); - Box::new(composer.get_locker_mut().get_locked_repository(!no_dev)?) - as Box + Box::new( + composer + .get_locker() + .borrow_mut() + .get_locked_repository(!no_dev)?, + ) as Box } else { if no_dev { remove_packages = local_repo.get_dev_package_names().clone(); -- cgit v1.3.1