diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-07-20 16:51:45 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-07-20 16:51:45 +0900 |
| commit | a2110fa811c8f6c7d1c45a83c6fd1077eb6f3461 (patch) | |
| tree | 620f3cea4ef0c99b5e4a0b7878a59b9e7dbabe36 /crates/shirabe/src/package/loader | |
| parent | 37ed5b8c6d4cda30e668d0221eb281431dbc8c67 (diff) | |
| download | php-shirabe-a2110fa811c8f6c7d1c45a83c6fd1077eb6f3461.tar.gz php-shirabe-a2110fa811c8f6c7d1c45a83c6fd1077eb6f3461.tar.zst php-shirabe-a2110fa811c8f6c7d1c45a83c6fd1077eb6f3461.zip | |
fix(php-shim): use PhpMixed::to_bool() for PHP truthy casts
Several call sites coerced PhpMixed to bool via `.as_bool()` (which
only matches a literal Bool variant) where the corresponding PHP code
does a plain `(bool)` cast or truthy check (isset()/array_key_exists()
+ implicit bool conversion). This silently dropped truthy non-bool
values (e.g. String("true"), String("1"), Int(1)) to their unwrap_or
default instead of PHP's actual truthy result. Switched these sites to
PhpMixed::to_bool(), which implements PHP's full truthy-cast rules.
Diffstat (limited to 'crates/shirabe/src/package/loader')
| -rw-r--r-- | crates/shirabe/src/package/loader/array_loader.rs | 5 | ||||
| -rw-r--r-- | crates/shirabe/src/package/loader/root_package_loader.rs | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/crates/shirabe/src/package/loader/array_loader.rs b/crates/shirabe/src/package/loader/array_loader.rs index 07937c31..3a78ff76 100644 --- a/crates/shirabe/src/package/loader/array_loader.rs +++ b/crates/shirabe/src/package/loader/array_loader.rs @@ -132,10 +132,7 @@ fn php_to_mirrors(value: &PhpMixed) -> Vec<Mirror> { .and_then(|v| v.as_string()) .unwrap_or("") .to_string(), - preferred: m - .get("preferred") - .and_then(|v| v.as_bool()) - .unwrap_or(false), + preferred: m.get("preferred").is_some_and(|v| v.to_bool()), }), _ => None, }) diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 95cd1225..284bb175 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -229,8 +229,8 @@ impl RootPackageLoader { real_package.set_stability_flags(stability_flags); real_package.set_references(references); - if let Some(prefer_stable) = config.get("prefer-stable").and_then(|v| v.as_bool()) { - real_package.set_prefer_stable(prefer_stable); + if let Some(prefer_stable) = config.get("prefer-stable").and_then(|v| v.as_opt()) { + real_package.set_prefer_stable(prefer_stable.to_bool()); } if let Some(pkg_config) = config.get("config").and_then(|v| v.as_array()) { |
