diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-05-22 01:29:48 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-05-22 01:43:48 +0900 |
| commit | 0b06f54103490e3ce5658e82bbc0119633e26cd8 (patch) | |
| tree | 687b075131d3679725e77e0931ff7c503a6c3034 /crates/shirabe/src/package | |
| parent | 2914770fba6b3cc03a68fae493f60470a41962ec (diff) | |
| download | php-shirabe-0b06f54103490e3ce5658e82bbc0119633e26cd8.tar.gz php-shirabe-0b06f54103490e3ce5658e82bbc0119633e26cd8.tar.zst php-shirabe-0b06f54103490e3ce5658e82bbc0119633e26cd8.zip | |
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) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package')
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/package/locker.rs | 9 |
2 files changed, 10 insertions, 7 deletions
diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 231c807..5d66931 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -27,7 +27,7 @@ use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RootPackageLoader { inner: ArrayLoader, - manager: RepositoryManager, + manager: std::rc::Rc<std::cell::RefCell<RepositoryManager>>, config: std::rc::Rc<std::cell::RefCell<Config>>, version_guesser: VersionGuesser, io: Option<Box<dyn IOInterface>>, @@ -35,7 +35,7 @@ pub struct RootPackageLoader { impl RootPackageLoader { pub fn new( - manager: RepositoryManager, + manager: std::rc::Rc<std::cell::RefCell<RepositoryManager>>, config: std::rc::Rc<std::cell::RefCell<Config>>, parser: Option<VersionParser>, version_guesser: Option<VersionGuesser>, @@ -281,10 +281,10 @@ impl RootPackageLoader { let repos = RepositoryFactory::default_repos( None, Some(std::rc::Rc::clone(&self.config)), - Some(&mut self.manager), + Some(&mut *self.manager.borrow_mut()), )?; for (_, repo) in repos { - self.manager.add_repository(repo); + self.manager.borrow_mut().add_repository(repo); } // TODO(phase-b): Config::get_repositories returns IndexMap<String, PhpMixed>, but // set_repositories expects Vec<IndexMap<String, PhpMixed>>; pass empty placeholder. diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index 5dd7ab4..ecd96e3 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -40,7 +40,7 @@ pub struct Locker { /// @var JsonFile lock_file: JsonFile, /// @var InstallationManager - installation_manager: InstallationManager, + installation_manager: std::rc::Rc<std::cell::RefCell<InstallationManager>>, /// @var string hash: String, /// @var string @@ -62,7 +62,7 @@ impl Locker { pub fn new( io: Box<dyn IOInterface>, lock_file: JsonFile, - installation_manager: InstallationManager, + installation_manager: std::rc::Rc<std::cell::RefCell<InstallationManager>>, composer_file_contents: &str, process: std::rc::Rc<std::cell::RefCell<ProcessExecutor>>, ) -> Self { @@ -824,7 +824,10 @@ impl Locker { return Ok(None); } - let path = self.installation_manager.get_install_path(package); + let path = self + .installation_manager + .borrow_mut() + .get_install_path(package); if path.is_none() { return Ok(None); } |
