From b1f74fd83663d26e14f92300f452a3c997d93d62 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 15 Aug 2026 08:56:04 +0900 Subject: fix(php-rpc): unpack the runtime bundle under the cache dir A worker whose PHP cannot read the bundle out of the executable gets it from an unpacked copy, which went to a directory derived from XDG_CACHE_HOME alone. That ignored COMPOSER_CACHE_DIR, COMPOSER_HOME and the cache-dir setting, and put the files outside the directory clear-cache and the platform conventions cover. The callers now pass Composer's configured cache directory down to base_path(). Co-Authored-By: Claude Opus 5 (1M context) --- crates/shirabe/tests/plugin/plugin_installer_test.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/tests/plugin/plugin_installer_test.rs') diff --git a/crates/shirabe/tests/plugin/plugin_installer_test.rs b/crates/shirabe/tests/plugin/plugin_installer_test.rs index 0e1f01ee..2a065cc5 100644 --- a/crates/shirabe/tests/plugin/plugin_installer_test.rs +++ b/crates/shirabe/tests/plugin/plugin_installer_test.rs @@ -58,6 +58,12 @@ pub(crate) fn lock_php_worker() -> std::sync::MutexGuard<'static, ()> { .unwrap_or_else(|poisoned| poisoned.into_inner()) } +fn load_composer_php_runtime() { + static CACHE: std::sync::OnceLock = std::sync::OnceLock::new(); + let cache = CACHE.get_or_init(|| tempfile::tempdir().expect("no cache directory for the test")); + EventDispatcher::__ensure_composer_php_runtime(cache.path()).unwrap(); +} + /// `__DIR__ . '/Fixtures'` of the upstream test class. fn fixtures_dir() -> String { let dir = std::path::Path::new(env!("CARGO_MANIFEST_DIR")) @@ -817,7 +823,7 @@ fn test_incapable_plugin_is_correctly_detected() { /// PHPUnit autoloads `Composer\Test\Plugin\Mock\Capability` from the Composer checkout; the /// worker resolves `Composer\` to `src/Composer` only, so the class file is loaded by path. fn load_mock_capability_class() { - EventDispatcher::__ensure_composer_php_runtime().unwrap(); + load_composer_php_runtime(); let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR")) .join("../../composer/tests/Composer/Test/Plugin/Mock/Capability.php") .canonicalize() @@ -1043,7 +1049,7 @@ fn test_querying_with_non_existing_or_wrong_capability_class_types_throws() { let _worker = lock_php_worker(); // `new \stdClass($ctorArgs)` receives the plugin, whose proxy stub implements the real // PluginInterface in the child. - EventDispatcher::__ensure_composer_php_runtime().unwrap(); + load_composer_php_runtime(); for wrong_implementation_class_type in non_existing_or_invalid_implementation_class_types() { assert_querying_with_invalid_capability_class_name_throws( &PhpMixed::String(wrong_implementation_class_type.to_string()), -- cgit v1.3.1-4-g156e