diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-08-11 23:52:28 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-08-11 23:52:28 +0900 |
| commit | daa1acf091627f4f1af63ad44eee988048fa4136 (patch) | |
| tree | 1f6b715079291086f4a4f4c7cab01760a1cb7c99 /crates/shirabe/src/dependency_resolver | |
| parent | 38621c67917fd015f884ea04517791cdc5058c6d (diff) | |
| download | php-shirabe-daa1acf091627f4f1af63ad44eee988048fa4136.tar.gz php-shirabe-daa1acf091627f4f1af63ad44eee988048fa4136.tar.zst php-shirabe-daa1acf091627f4f1af63ad44eee988048fa4136.zip | |
chore(php-shim): drop the HHVM_VERSION constant
The constant was None and defined("HHVM_VERSION") reports it undefined, so
every branch guarded by it was dead: shirabe is a Rust binary and never runs
on HHVM. HhvmDetector keeps probing for an `hhvm` binary in PATH, which is
what actually produces the hhvm platform package.
Two of the dropped branches ask about the PHP runtime that consumes the
result rather than about shirabe itself -- the class loader's Hack file
lookup and the class map parser's enum scanning -- so both get a
TODO(php-runtime) marker.
Diffstat (limited to 'crates/shirabe/src/dependency_resolver')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/problem.rs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs index 4510b125..1da6028c 100644 --- a/crates/shirabe/src/dependency_resolver/problem.rs +++ b/crates/shirabe/src/dependency_resolver/problem.rs @@ -12,9 +12,9 @@ use crate::repository::RepositorySet; use indexmap::IndexMap; use shirabe_pcre::{CaptureKey, Preg}; use shirabe_php_shim::{ - CmpOp, LogicException, PhpMixed, defined, extension_loaded, implode, loosely_compare, - php_regex, spl_object_hash, sprintf, str_replace, stripos, strpos, strtolower, substr, - substr_count, version_compare, + CmpOp, LogicException, PhpMixed, extension_loaded, implode, loosely_compare, php_regex, + spl_object_hash, sprintf, str_replace, stripos, strpos, strtolower, substr, substr_count, + version_compare, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MultiConstraint; @@ -398,10 +398,7 @@ impl Problem { Self::constraint_to_text(constraint) ); - if defined("HHVM_VERSION") - || (package_name == "hhvm" - && !pool.what_provides(package_name, None).is_empty()) - { + if package_name == "hhvm" && !pool.what_provides(package_name, None).is_empty() { return Ok(( msg, "your HHVM version does not satisfy that requirement.".to_string(), |
