From f1d65c337c63b6aa3582aabc64bfbbb2f949127c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 9 Aug 2026 07:29:10 +0900 Subject: test(platform): drop HHVM-only paths from HhvmDetector test shirabe never runs on HHVM, so the HHVM_VERSION_ID branches are dead. Dropping them leaves the shim's unimplemented `constant()` without a caller, so remove it as well. Co-Authored-By: Claude Opus 5 --- crates/shirabe-php-shim/src/runtime.rs | 6 ----- .../shirabe/tests/platform/hhvm_detector_test.rs | 28 ++-------------------- 2 files changed, 2 insertions(+), 32 deletions(-) (limited to 'crates') diff --git a/crates/shirabe-php-shim/src/runtime.rs b/crates/shirabe-php-shim/src/runtime.rs index 13513b9d..44cae087 100644 --- a/crates/shirabe-php-shim/src/runtime.rs +++ b/crates/shirabe-php-shim/src/runtime.rs @@ -43,12 +43,6 @@ pub const PHP_OS: &str = match std::env::consts::OS.as_bytes() { _ => std::env::consts::OS, }; -pub fn constant(_name: &str) -> PhpMixed { - // TODO(php-runtime): resolving a constant by name needs a runtime constant registry, which the shim - // does not provide (constants are ported as Rust `const`s, not looked up by string). - todo!() -} - // Models the constants defined in a standard modern PHP CLI environment on a // non-Windows platform with the common extensions loaded (curl, openssl, json). // Windows-only, HHVM and Composer-bootstrap constants are reported undefined. diff --git a/crates/shirabe/tests/platform/hhvm_detector_test.rs b/crates/shirabe/tests/platform/hhvm_detector_test.rs index f1ec6562..340bf888 100644 --- a/crates/shirabe/tests/platform/hhvm_detector_test.rs +++ b/crates/shirabe/tests/platform/hhvm_detector_test.rs @@ -5,7 +5,7 @@ use shirabe::platform::hhvm_detector::HhvmDetectorInterface; use shirabe::util::Platform; use shirabe::util::ProcessExecutor; use shirabe_external_packages::symfony::process::ExecutableFinder; -use shirabe_php_shim::{PhpMixed, constant, defined}; +use shirabe_php_shim::PhpMixed; use shirabe_semver::VersionParser; fn set_up() -> HhvmDetector { @@ -16,22 +16,12 @@ fn set_up() -> HhvmDetector { #[test] fn test_hhvm_version_when_executing_in_hhvm() { - let mut hhvm_detector = set_up(); - if !defined("HHVM_VERSION_ID") { - // markTestSkipped('Not running with HHVM') - return; - } - let version = hhvm_detector.get_version(); - assert_eq!(version_id_to_version(), version); + // Always succeeds: shirabe never runs on HHVM. } #[test] fn test_hhvm_version_when_executing_in_php() { let mut hhvm_detector = set_up(); - if defined("HHVM_VERSION_ID") { - // markTestSkipped('Running with HHVM') - return; - } if Platform::is_windows() { // markTestSkipped('Test does not run on Windows') return; @@ -68,17 +58,3 @@ fn test_hhvm_version_when_executing_in_php() { VersionParser.normalize(&detected_version, None).unwrap() ); } - -fn version_id_to_version() -> Option { - if !defined("HHVM_VERSION_ID") { - return None; - } - - let hhvm_version_id = constant("HHVM_VERSION_ID").as_int().unwrap(); - Some(format!( - "{}.{}.{}", - hhvm_version_id / 10000, - (hhvm_version_id / 100) % 100, - hhvm_version_id % 100, - )) -} -- cgit v1.3.1-4-g156e