From a02fc7d728a9973a3275a0f47604081c4439b424 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 4 Aug 2026 02:25:28 +0900 Subject: feat(plugin): activate plugins through the PHP RPC worker Implement the remainder of PluginManager::registerPackage: the plugin autoload map is built by the ported createLoader/parseAutoloads and served to the worker over the existing reverse-RPC autoloader, files entries go through a composerRequire-equivalent glue call, and already-defined classes take the upstream _composer_tmp rename/eval path. Instantiation uses the new NewObject/CallPhpMethod lanes backed by a P table in the worker; PhpPluginProxy adapts the resulting handle to PluginInterface, with $composer/$io exposed to plugin callbacks via an R table (unsupported methods stay explicit errors). Hand-written proxy stubs cover Composer, PartialComposer and the IO hierarchy, and the stub autoloader is re-prepended after loading the Composer PHP runtime so its vendor autoloader cannot shadow proxied FQCNs. FilesystemRepository::write now mirrors InstalledVersions::reload into a running worker (class_exists-guarded, so an unloaded class keeps its upstream lazy-load behavior), removing the previously undefined observation window. The installer pipeline passes the installed repository as a shared handle instead of a long-lived `&mut dyn`: plugin registration runs inside InstallationManager::execute and re-enters the same local repository through the RepositoryManager, which would panic on the RefCell re-borrow under the old shape. PluginInterface lifecycle methods now take an owned ComposerHandle (plugins retain $composer past the call) and return anyhow::Result (PHP plugin code may throw); the plugin list uses shared ownership so the identity comparison of removePlugin survives the dual storage in registeredPlugins, matching PHP reference semantics. Ports the activate/upgrade/uninstall tests of PluginInstallerTest, serialized across the shared worker process whose persistent class table is exactly what exercises the rename path. Co-Authored-By: Claude Fable 5 --- .../tests/installer/installation_manager_test.rs | 58 +++++++++------------- 1 file changed, 24 insertions(+), 34 deletions(-) (limited to 'crates/shirabe/tests/installer/installation_manager_test.rs') diff --git a/crates/shirabe/tests/installer/installation_manager_test.rs b/crates/shirabe/tests/installer/installation_manager_test.rs index 6cc231f5..8f2d7d4f 100644 --- a/crates/shirabe/tests/installer/installation_manager_test.rs +++ b/crates/shirabe/tests/installer/installation_manager_test.rs @@ -10,7 +10,7 @@ use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; use shirabe::package::PackageInterfaceHandle; use shirabe::package::handle::CompletePackageHandle; -use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterface}; +use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterfaceHandle}; use shirabe::util::http_downloader::HttpDownloader; use shirabe::util::r#loop::Loop; use shirabe_php_shim::PhpMixed; @@ -39,11 +39,9 @@ fn set_up() -> SetUp { SetUp { loop_, io } } -// Equivalent to `getMockBuilder(InstallerInterface::class)->getMock()`. mockall cannot generate an -// `#[async_trait]` impl for the async methods that take `&mut dyn InstalledRepositoryInterface` -// (the object lifetime async_trait inserts clashes with mockall's generated lifetimes), so the -// expectations live on inherent methods and a thin hand-written InstallerInterface impl forwards to -// them, dropping the unused `repo` argument exactly as the PHPUnit mock ignores it. The methods not +// Equivalent to `getMockBuilder(InstallerInterface::class)->getMock()`. The expectations live on +// inherent methods and a thin hand-written InstallerInterface impl forwards to them, dropping the +// unused `repo` argument exactly as the PHPUnit mock ignores it. The methods not // configured by any test (is_installed/download/prepare/cleanup/get_install_path, and the defaulted // as_binary_presence_interface/as_plugin_installer_mut) return the same defaults as an unconfigured // PHPUnit mock. @@ -75,7 +73,7 @@ impl InstallerInterface for MockInstaller { fn is_installed( &self, - _repo: &mut dyn InstalledRepositoryInterface, + _repo: &InstalledRepositoryInterfaceHandle, _package: PackageInterfaceHandle, ) -> anyhow::Result { Ok(false) @@ -100,7 +98,7 @@ impl InstallerInterface for MockInstaller { async fn install( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, package: PackageInterfaceHandle, ) -> anyhow::Result> { MockInstaller::install(self, package) @@ -108,7 +106,7 @@ impl InstallerInterface for MockInstaller { async fn update( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, initial: PackageInterfaceHandle, target: PackageInterfaceHandle, ) -> anyhow::Result> { @@ -117,7 +115,7 @@ impl InstallerInterface for MockInstaller { async fn uninstall( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, package: PackageInterfaceHandle, ) -> anyhow::Result> { MockInstaller::uninstall(self, package) @@ -175,7 +173,7 @@ impl InstallerInterface for BinaryInstaller { fn is_installed( &self, - _repo: &mut dyn InstalledRepositoryInterface, + _repo: &InstalledRepositoryInterfaceHandle, _package: PackageInterfaceHandle, ) -> anyhow::Result { Ok(false) @@ -200,7 +198,7 @@ impl InstallerInterface for BinaryInstaller { async fn install( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, _package: PackageInterfaceHandle, ) -> anyhow::Result> { Ok(None) @@ -208,7 +206,7 @@ impl InstallerInterface for BinaryInstaller { async fn update( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, _initial: PackageInterfaceHandle, _target: PackageInterfaceHandle, ) -> anyhow::Result> { @@ -217,7 +215,7 @@ impl InstallerInterface for BinaryInstaller { async fn uninstall( &self, - _repo: &std::cell::RefCell<&mut dyn InstalledRepositoryInterface>, + _repo: &InstalledRepositoryInterfaceHandle, _package: PackageInterfaceHandle, ) -> anyhow::Result> { Ok(None) @@ -360,11 +358,9 @@ fn test_install() { let operation = InstallOperation::new(package); - let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.install( - &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), - &operation, - )); + let repository = + InstalledRepositoryInterfaceHandle::new(InstalledArrayRepository::new().unwrap()); + run(manager.install(&repository, &operation)); } #[test] @@ -395,11 +391,9 @@ fn test_update_with_equal_types() { let operation = UpdateOperation::new(initial, target); - let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.update( - &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), - &operation, - )); + let repository = + InstalledRepositoryInterfaceHandle::new(InstalledArrayRepository::new().unwrap()); + run(manager.update(&repository, &operation)); } #[test] @@ -440,11 +434,9 @@ fn test_update_with_not_equal_types() { let operation = UpdateOperation::new(initial, target); - let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.update( - &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), - &operation, - )); + let repository = + InstalledRepositoryInterfaceHandle::new(InstalledArrayRepository::new().unwrap()); + run(manager.update(&repository, &operation)); } #[test] @@ -471,11 +463,9 @@ fn test_uninstall() { let operation = UninstallOperation::new(package); - let mut repository = InstalledArrayRepository::new().unwrap(); - run(manager.uninstall( - &std::cell::RefCell::new(&mut repository as &mut dyn InstalledRepositoryInterface), - &operation, - )); + let repository = + InstalledRepositoryInterfaceHandle::new(InstalledArrayRepository::new().unwrap()); + run(manager.uninstall(&repository, &operation)); } #[test] -- cgit v1.3.1