diff options
Diffstat (limited to 'crates/shirabe/src/installer')
| -rw-r--r-- | crates/shirabe/src/installer/installer_event.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/library_installer.rs | 16 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/package_event.rs | 8 | ||||
| -rw-r--r-- | crates/shirabe/src/installer/plugin_installer.rs | 4 |
4 files changed, 17 insertions, 19 deletions
diff --git a/crates/shirabe/src/installer/installer_event.rs b/crates/shirabe/src/installer/installer_event.rs index 5adde1c..00a0096 100644 --- a/crates/shirabe/src/installer/installer_event.rs +++ b/crates/shirabe/src/installer/installer_event.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Installer/InstallerEvent.php -use crate::composer::ComposerWeakHandle; +use crate::composer::FullComposerWeakHandle; use crate::dependency_resolver::Transaction; use crate::event_dispatcher::Event; use crate::io::IOInterface; @@ -8,7 +8,7 @@ use crate::io::IOInterface; #[derive(Debug)] pub struct InstallerEvent { inner: Event, - composer: ComposerWeakHandle, + composer: FullComposerWeakHandle, io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, dev_mode: bool, execute_operations: bool, @@ -18,7 +18,7 @@ pub struct InstallerEvent { impl InstallerEvent { pub fn new( event_name: String, - composer: ComposerWeakHandle, + composer: FullComposerWeakHandle, io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, dev_mode: bool, execute_operations: bool, @@ -35,7 +35,7 @@ impl InstallerEvent { } } - pub fn get_composer(&self) -> &ComposerWeakHandle { + pub fn get_composer(&self) -> &FullComposerWeakHandle { &self.composer } diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs index c1fedef..b50dbff 100644 --- a/crates/shirabe/src/installer/library_installer.rs +++ b/crates/shirabe/src/installer/library_installer.rs @@ -9,7 +9,7 @@ use shirabe_php_shim::{ realpath, rmdir, rtrim, strpos, }; -use crate::composer::PartialComposerWeakHandle; +use crate::composer::{AnyComposerWeakHandle, Composer, PartialComposer}; use crate::downloader::DownloadManager; use crate::installer::BinaryInstaller; use crate::installer::BinaryPresenceInterface; @@ -24,7 +24,7 @@ use crate::util::Silencer; /// Package installation manager. #[derive(Debug)] pub struct LibraryInstaller { - pub(crate) composer: PartialComposerWeakHandle, + pub(crate) composer: AnyComposerWeakHandle, pub(crate) vendor_dir: String, pub(crate) download_manager: Option<std::rc::Rc<std::cell::RefCell<DownloadManager>>>, pub(crate) io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, @@ -37,7 +37,7 @@ impl LibraryInstaller { /// Initializes library installer. pub fn new( io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, - composer: PartialComposerWeakHandle, + composer: AnyComposerWeakHandle, r#type: Option<String>, filesystem: Option<std::rc::Rc<std::cell::RefCell<Filesystem>>>, binary_installer: Option<BinaryInstaller>, @@ -48,15 +48,13 @@ impl LibraryInstaller { let download_manager = composer_rc .as_full() - .map(|full| full.borrow().get_download_manager()); - - let composer_ref = composer_rc.borrow_partial(); + .map(|full| full.get_download_manager()); let filesystem = filesystem .unwrap_or_else(|| std::rc::Rc::new(std::cell::RefCell::new(Filesystem::new(None)))); let vendor_dir = rtrim( // TODO(phase-b): Config::get returns PhpMixed; coerce to String via get_str. - &composer_ref + &composer_rc .get_config() .borrow_mut() .get_str("vendor-dir") @@ -68,7 +66,7 @@ impl LibraryInstaller { // TODO(phase-b): pass io by reference/clone todo!("io reference"), rtrim( - &composer_ref + &composer_rc .get_config() .borrow_mut() .get_str("bin-dir") @@ -76,7 +74,7 @@ impl LibraryInstaller { Some("/"), ), // TODO(phase-b): Config::get returns PhpMixed; coerce to String via get_str. - composer_ref + composer_rc .get_config() .borrow_mut() .get_str("bin-compat") diff --git a/crates/shirabe/src/installer/package_event.rs b/crates/shirabe/src/installer/package_event.rs index 342732d..62bc395 100644 --- a/crates/shirabe/src/installer/package_event.rs +++ b/crates/shirabe/src/installer/package_event.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Installer/PackageEvent.php -use crate::composer::ComposerWeakHandle; +use crate::composer::FullComposerWeakHandle; use crate::dependency_resolver::operation::OperationInterface; use crate::event_dispatcher::Event; use crate::io::IOInterface; @@ -10,7 +10,7 @@ use indexmap::IndexMap; #[derive(Debug)] pub struct PackageEvent { inner: Event, - composer: ComposerWeakHandle, + composer: FullComposerWeakHandle, io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, dev_mode: bool, local_repo: Box<dyn RepositoryInterface>, @@ -21,7 +21,7 @@ pub struct PackageEvent { impl PackageEvent { pub fn new( event_name: String, - composer: ComposerWeakHandle, + composer: FullComposerWeakHandle, io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, dev_mode: bool, local_repo: Box<dyn RepositoryInterface>, @@ -43,7 +43,7 @@ impl PackageEvent { self.inner.get_name() } - pub fn get_composer(&self) -> &ComposerWeakHandle { + pub fn get_composer(&self) -> &FullComposerWeakHandle { &self.composer } diff --git a/crates/shirabe/src/installer/plugin_installer.rs b/crates/shirabe/src/installer/plugin_installer.rs index 38fcb0d..8776103 100644 --- a/crates/shirabe/src/installer/plugin_installer.rs +++ b/crates/shirabe/src/installer/plugin_installer.rs @@ -1,6 +1,6 @@ //! ref: composer/src/Composer/Installer/PluginInstaller.php -use crate::composer::PartialComposerWeakHandle; +use crate::composer::AnyComposerWeakHandle; use crate::installer::BinaryInstaller; use crate::installer::InstallerInterface; use crate::installer::LibraryInstaller; @@ -22,7 +22,7 @@ pub struct PluginInstaller { impl PluginInstaller { pub fn new( io: std::rc::Rc<std::cell::RefCell<dyn IOInterface>>, - composer: PartialComposerWeakHandle, + composer: AnyComposerWeakHandle, fs: Option<std::rc::Rc<std::cell::RefCell<Filesystem>>>, binary_installer: Option<BinaryInstaller>, ) -> Self { |