From 971824aa15334fd12d08ae0f441f6bf6079344c3 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 7 Jun 2026 10:33:53 +0900 Subject: feat(shirabe): resolve phase-b TODOs with shared ownership Replace TODO(phase-b) placeholders (todo!() and commented-out code) with real implementations: - Share JsonFile via Rc> so JsonConfigSource and the owning command can hold the same instance (base_config_command, config_command, repository_command, require_command, create_project, remove_command, factory) - Change InstallerInterface methods (is_installed, download, prepare, cleanup, get_install_path) to &mut self so initialize_vendor_dir can run, propagated to all installer implementations - Pass io/config/filesystem/process by clone instead of moving or stubbing (auth_helper, svn_driver, curl_downloader, library_installer) - Make TransportException Clone and store it by value in VcsRepository - Clone operations in Transaction sort, root_aliases/temporary_constraints in RepositorySet::create_pool, and share CompletePackage via handle in PlatformRepository - Wire up set_option, set_requires/set_dev_requires, installation manager setters, BumpCommand::set_composer, and clean_backups/set_local_phar --- crates/shirabe/src/repository/platform_repository.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'crates/shirabe/src/repository/platform_repository.rs') diff --git a/crates/shirabe/src/repository/platform_repository.rs b/crates/shirabe/src/repository/platform_repository.rs index f194e69..a35874d 100644 --- a/crates/shirabe/src/repository/platform_repository.rs +++ b/crates/shirabe/src/repository/platform_repository.rs @@ -1641,14 +1641,14 @@ impl PlatformRepository { name: self.overrides["php"].name.clone(), version: self.overrides["php"].version.clone(), }; - let mut overrider = + let overrider = self.add_overridden_package(&php_override, Some(package.get_pretty_name()))?; let actual_text = if package.get_version() == overrider.get_version() { "same as actual".to_string() } else { format!("actual: {}", package.get_pretty_version()) }; - let current_description = overrider.get_description().unwrap_or("").to_string(); + let current_description = overrider.get_description().unwrap_or_default(); overrider.set_description(format!("{}, {}", current_description, actual_text)); return Ok(()); @@ -1662,7 +1662,7 @@ impl PlatformRepository { &mut self, r#override: &PlatformOverride, name: Option, - ) -> anyhow::Result { + ) -> anyhow::Result { let version_str = match &r#override.version { PhpMixed::String(s) => s.clone(), _ => "".to_string(), @@ -1681,14 +1681,11 @@ impl PlatformRepository { let mut extra: IndexMap = IndexMap::new(); extra.insert("config.platform".to_string(), PhpMixed::Bool(true)); package.inner.set_extra(extra); - // TODO(phase-b): CompletePackage is a PHP class (shared by ref); cannot Clone. - // The container should likely store Rc> so both the inner - // ArrayRepository and the function caller can share ownership. - let _: () = todo!("share CompletePackage via Rc between add_package and return"); + let package = CompletePackageHandle::from_complete_package(package); + self.add_package(package.clone().into())?; - #[allow(unreachable_code)] if package.get_name() == "php" { - let parts = explode(".", package.get_version()); + let parts = explode(".", &package.get_version()); let head = array_slice_strs(&parts, 0, Some(3)); *LAST_SEEN_PLATFORM_PHP.lock().unwrap() = Some(implode(".", &head)); } -- cgit v1.3.1