From 8c316f2c5e93888f4b3a5b8c18df3373b54fa816 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 24 Jul 2026 20:22:58 +0900 Subject: fix(dependency-resolver): query real PHP for ext-* version/loaded checks Two shim gaps made the extension-related branches of solver-problem messages wrong: - phpversion($ext) with a non-empty extension can't be known statically (it's shirabe-php-shim's todo!()); Problem::get_missing_package_reason now calls shirabe_php_rpc::phpversion, the same RPC bridge platform::runtime::Runtime::get_extension_version already uses. - extension_loaded's hardcoded allowlist was missing "pcre", a mandatory always-compiled-in PHP extension, so ext-pcre was misreported as "missing from your system" instead of "disabled by your platform config" whenever a platform override disabled it. Also fix XdebugHandler::getAllIniFiles() always returning `[""]` (a php-runtime stub): create_extension_hint()'s early-return guard (`paths[0] empty && len==1`) fired unconditionally, silently dropping the entire "To enable extensions..." hint from every solver-problem message that mentions missing extensions. shirabe-external-packages can't depend on shirabe-php-rpc (shirabe-php-rpc already depends on shirabe-external-packages), so IniHelper::get_all() queries a new get_all_ini_files RPC command directly instead of going through the stub. This exposed that XdebugHandler is never constructed with a name because bin/composer's restart-without-Xdebug bootstrap was never ported to main.rs, making COMPOSER_ORIGINAL_INIS-driven behavior unreachable; documented with a TODO(phase-c) and updated ini_helper_test.rs's ignore reasons (and ignored test_with_no_ini, which only passed before by coincidence with the old stub's constant output) to match. --- crates/shirabe/src/util/ini_helper.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'crates/shirabe/src/util') diff --git a/crates/shirabe/src/util/ini_helper.rs b/crates/shirabe/src/util/ini_helper.rs index 57894113..c36b9189 100644 --- a/crates/shirabe/src/util/ini_helper.rs +++ b/crates/shirabe/src/util/ini_helper.rs @@ -1,13 +1,15 @@ //! ref: composer/src/Composer/Util/IniHelper.php -use shirabe_external_packages::composer::xdebug_handler::XdebugHandler; - pub struct IniHelper; impl IniHelper { /// Returns an array of php.ini locations with at least one entry. pub fn get_all() -> Vec { - XdebugHandler::get_all_ini_files() + // PHP: XdebugHandler::getAllIniFiles(). shirabe_external_packages::XdebugHandler's port + // of that method can't reach the PHP RPC bridge (shirabe-php-rpc already depends on + // shirabe-external-packages, so the reverse dependency would cycle), so query the real + // PHP runtime's loaded/scanned ini files here instead. + shirabe_php_rpc::get_all_ini_files() } /// Describes the location of the loaded php.ini file(s). -- cgit v1.3.1