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/metapackage_installer_test.rs | 80 ++++++++-------------- 1 file changed, 29 insertions(+), 51 deletions(-) (limited to 'crates/shirabe/tests/installer/metapackage_installer_test.rs') diff --git a/crates/shirabe/tests/installer/metapackage_installer_test.rs b/crates/shirabe/tests/installer/metapackage_installer_test.rs index b87fdebd..8675c00e 100644 --- a/crates/shirabe/tests/installer/metapackage_installer_test.rs +++ b/crates/shirabe/tests/installer/metapackage_installer_test.rs @@ -8,7 +8,7 @@ use crate::test_case::get_package; use shirabe::installer::{InstallerInterface, MetapackageInstaller}; use shirabe::io::IOInterface; use shirabe::io::null_io::NullIO; -use shirabe::repository::{InstalledArrayRepository, RepositoryInterface}; +use shirabe::repository::{InstalledArrayRepository, InstalledRepositoryInterfaceHandle}; fn installer() -> MetapackageInstaller { let io: std::rc::Rc> = @@ -20,17 +20,13 @@ fn installer() -> MetapackageInstaller { fn test_install() { let package = get_package("test/pkg", "1.0.0"); let installer = installer(); - let mut repository = InstalledArrayRepository::new_with_packages(vec![]).unwrap(); + let repository = InstalledRepositoryInterfaceHandle::new( + InstalledArrayRepository::new_with_packages(vec![]).unwrap(), + ); - run(installer.install( - &std::cell::RefCell::new( - &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, - ), - package.clone(), - )) - .unwrap(); + run(installer.install(&repository, package.clone())).unwrap(); - assert!(repository.has_package(package).unwrap()); + assert!(repository.borrow_mut().has_package(package).unwrap()); } #[test] @@ -38,59 +34,41 @@ fn test_update() { let initial = get_package("test/initial", "1.0.0"); let target = get_package("test/target", "1.0.1"); let installer = installer(); - let mut repository = - InstalledArrayRepository::new_with_packages(vec![initial.clone()]).unwrap(); - - run(installer.update( - &std::cell::RefCell::new( - &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, - ), - initial.clone(), - target.clone(), - )) - .unwrap(); + let repository = InstalledRepositoryInterfaceHandle::new( + InstalledArrayRepository::new_with_packages(vec![initial.clone()]).unwrap(), + ); - assert!(!repository.has_package(initial.clone()).unwrap()); - assert!(repository.has_package(target.clone()).unwrap()); + run(installer.update(&repository, initial.clone(), target.clone())).unwrap(); - // Updating again, with the initial package no longer installed, fails. assert!( - run(installer.update( - &std::cell::RefCell::new( - &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface - ), - initial, - target - )) - .is_err() + !repository + .borrow_mut() + .has_package(initial.clone()) + .unwrap() ); + assert!(repository.borrow_mut().has_package(target.clone()).unwrap()); + + // Updating again, with the initial package no longer installed, fails. + assert!(run(installer.update(&repository, initial, target)).is_err()); } #[test] fn test_uninstall() { let package = get_package("test/pkg", "1.0.0"); let installer = installer(); - let mut repository = - InstalledArrayRepository::new_with_packages(vec![package.clone()]).unwrap(); - - run(installer.uninstall( - &std::cell::RefCell::new( - &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface, - ), - package.clone(), - )) - .unwrap(); + let repository = InstalledRepositoryInterfaceHandle::new( + InstalledArrayRepository::new_with_packages(vec![package.clone()]).unwrap(), + ); - assert!(!repository.has_package(package.clone()).unwrap()); + run(installer.uninstall(&repository, package.clone())).unwrap(); - // Uninstalling again, with the package no longer installed, fails. assert!( - run(installer.uninstall( - &std::cell::RefCell::new( - &mut repository as &mut dyn shirabe::repository::InstalledRepositoryInterface - ), - package - )) - .is_err() + !repository + .borrow_mut() + .has_package(package.clone()) + .unwrap() ); + + // Uninstalling again, with the package no longer installed, fails. + assert!(run(installer.uninstall(&repository, package)).is_err()); } -- cgit v1.3.1