From a2110fa811c8f6c7d1c45a83c6fd1077eb6f3461 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Mon, 20 Jul 2026 16:51:45 +0900 Subject: 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. --- crates/shirabe/src/config.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'crates/shirabe/src/config.rs') diff --git a/crates/shirabe/src/config.rs b/crates/shirabe/src/config.rs index 8f78ecca..c389063b 100644 --- a/crates/shirabe/src/config.rs +++ b/crates/shirabe/src/config.rs @@ -637,8 +637,7 @@ impl Config { }; Ok(PhpMixed::Bool( - val.as_string() != Some("false") - && val.as_bool().unwrap_or_else(|| !val.is_null()), + val.as_string() != Some("false") && val.to_bool(), )) } @@ -653,7 +652,7 @@ impl Config { let v = self.config.get(key).cloned().unwrap_or(PhpMixed::Null); Ok(PhpMixed::Bool( - v.as_string() != Some("false") && v.as_bool().unwrap_or(false), + v.as_string() != Some("false") && v.to_bool(), )) } @@ -1179,8 +1178,8 @@ impl Config { .get("ssl") .and_then(|v| v.as_array()) .and_then(|m| m.get("verify_peer")); - if let Some(v) = verify_peer - && v.as_bool() == Some(false) + if let Some(v) = verify_peer.and_then(|v| v.as_opt()) + && !v.to_bool() { warning = Some("verify_peer".to_string()); } @@ -1189,8 +1188,8 @@ impl Config { .get("ssl") .and_then(|v| v.as_array()) .and_then(|m| m.get("verify_peer_name")); - if let Some(v) = verify_peer_name - && v.as_bool() == Some(false) + if let Some(v) = verify_peer_name.and_then(|v| v.as_opt()) + && !v.to_bool() { warning = match warning { None => Some("verify_peer_name".to_string()), -- cgit v1.3.1