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/config/json_config_source.rs | 39 +++++++++++++++---------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'crates/shirabe/src/config') diff --git a/crates/shirabe/src/config/json_config_source.rs b/crates/shirabe/src/config/json_config_source.rs index 5d81793..532c1d8 100644 --- a/crates/shirabe/src/config/json_config_source.rs +++ b/crates/shirabe/src/config/json_config_source.rs @@ -18,7 +18,7 @@ use crate::util::Filesystem; #[derive(Debug)] pub struct JsonConfigSource { /// @var JsonFile - file: JsonFile, + file: std::rc::Rc>, /// @var bool auth_config: bool, @@ -26,7 +26,7 @@ pub struct JsonConfigSource { impl JsonConfigSource { /// Constructor - pub fn new(file: JsonFile, auth_config: bool) -> Self { + pub fn new(file: std::rc::Rc>, auth_config: bool) -> Self { Self { file, auth_config } } @@ -39,30 +39,30 @@ impl JsonConfigSource { mut args: Vec, ) -> Result<()> { let contents; - if self.file.exists() { - if !is_writable(self.file.get_path()) { + if self.file.borrow().exists() { + if !is_writable(self.file.borrow().get_path()) { return Err(RuntimeException { message: sprintf( "The file \"%s\" is not writable.", - &[PhpMixed::String(self.file.get_path().to_string())], + &[PhpMixed::String(self.file.borrow().get_path().to_string())], ), code: 0, } .into()); } - if !Filesystem::is_readable(self.file.get_path()) { + if !Filesystem::is_readable(self.file.borrow().get_path()) { return Err(RuntimeException { message: sprintf( "The file \"%s\" is not readable.", - &[PhpMixed::String(self.file.get_path().to_string())], + &[PhpMixed::String(self.file.borrow().get_path().to_string())], ), code: 0, } .into()); } - contents = file_get_contents(self.file.get_path()).unwrap_or_default(); + contents = file_get_contents(self.file.borrow().get_path()).unwrap_or_default(); } else if self.auth_config { contents = "{\n}\n".to_string(); } else { @@ -71,7 +71,7 @@ impl JsonConfigSource { let mut manipulator = JsonManipulator::new(contents.clone())?; - let new_file = !self.file.exists(); + let new_file = !self.file.borrow().exists(); // override manipulator method for auth config files let mut method = method.to_string(); @@ -103,10 +103,13 @@ impl JsonConfigSource { .as_bool() .unwrap_or(false); if manipulator_result { - file_put_contents(self.file.get_path(), manipulator.get_contents().as_bytes()); + file_put_contents( + self.file.borrow().get_path(), + manipulator.get_contents().as_bytes(), + ); } else { // on failed clean update, call the fallback and rewrite the whole file - let mut config = self.file.read()?; + let mut config = self.file.borrow_mut().read()?; self.array_unshift_ref(&mut args, &mut config); fallback(&mut config, &mut args); // avoid ending up with arrays for keys that should be objects @@ -199,17 +202,21 @@ impl JsonConfigSource { } } } - self.file.write(config)?; + self.file.borrow().write(config)?; } - match self.file.validate_schema(JsonFile::LAX_SCHEMA, None) { + match self + .file + .borrow() + .validate_schema(JsonFile::LAX_SCHEMA, None) + { Ok(_) => {} Err(e) => { let Some(jve) = e.downcast_ref::() else { return Err(e); }; // restore contents to the original state - file_put_contents(self.file.get_path(), contents.as_bytes()); + file_put_contents(self.file.borrow().get_path(), contents.as_bytes()); return Err(RuntimeException { message: format!( "Failed to update composer.json with a valid format, reverting to the original content. Please report an issue to us with details (command you run and a copy of your composer.json). {}{}", @@ -223,7 +230,7 @@ impl JsonConfigSource { } if new_file { - let path = self.file.get_path().to_string(); + let path = self.file.borrow().get_path().to_string(); let _ = Silencer::call(|| { chmod(&path, 0o600); Ok(()) @@ -250,7 +257,7 @@ impl JsonConfigSource { impl ConfigSourceInterface for JsonConfigSource { fn get_name(&self) -> String { - self.file.get_path().to_string() + self.file.borrow().get_path().to_string() } fn add_repository(&mut self, name: &str, config: PhpMixed, append: bool) -> Result<()> { -- cgit v1.3.1