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/self_update_command.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/command/self_update_command.rs') diff --git a/crates/shirabe/src/command/self_update_command.rs b/crates/shirabe/src/command/self_update_command.rs index ccfbe07..8645ce1 100644 --- a/crates/shirabe/src/command/self_update_command.rs +++ b/crates/shirabe/src/command/self_update_command.rs @@ -20,7 +20,8 @@ use shirabe_php_shim::{ }; use crate::command::{BaseCommand, BaseCommandData, HasBaseCommandData}; -use crate::composer::Composer; +use crate::composer; +use crate::composer::ComposerHandle; use crate::config::Config; use crate::console::input::InputArgument; use crate::console::input::InputOption; @@ -280,7 +281,7 @@ impl SelfUpdateCommand { .as_string() .map(|s| s.to_string()) .unwrap_or_else(|| latest_version.clone()); - let current_major_version = Preg::replace(r"{^(\d+).*}", "$1", &Composer::get_version())?; + let current_major_version = Preg::replace(r"{^(\d+).*}", "$1", &composer::get_version())?; let update_major_version = Preg::replace(r"{^(\d+).*}", "$1", &update_version)?; let preview_major_version = Preg::replace( r"{^(\d+).*}", @@ -382,7 +383,7 @@ impl SelfUpdateCommand { channel_string.push_str(".x"); } - if Composer::VERSION == update_version.as_str() { + if composer::VERSION == update_version.as_str() { io.write_error3( &sprintf( "You are already using the latest available Composer version %s (%s channel).", @@ -414,11 +415,11 @@ impl SelfUpdateCommand { "%s/%s-%s%s", &[ PhpMixed::String(rollback_dir.clone()), - PhpMixed::String(strtr(Composer::RELEASE_DATE, " :", "_-")), + PhpMixed::String(strtr(composer::RELEASE_DATE, " :", "_-")), PhpMixed::String(Preg::replace( r"{^([0-9a-f]{7})[0-9a-f]{33}$}", "$1", - &Composer::VERSION, + &composer::VERSION, )?), PhpMixed::String(Self::OLD_INSTALL_EXT.to_string()), ], @@ -637,7 +638,7 @@ RGv89BPD+2DLnJysngsvVaUCAwEAAQ==\n\ io.write_error3( &sprintf( "Use composer self-update --rollback to return to version %s", - &[PhpMixed::String(Composer::VERSION.to_string())], + &[PhpMixed::String(composer::VERSION.to_string())], ), true, io_interface::NORMAL, -- cgit v1.3.1