From f05e1a55cf0d44e9611e06a3d7b4fccdcb90ce7b Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 21 Jun 2026 17:42:32 +0900 Subject: refactor(php-shim): split filter_var into per-filter functions Replace the dispatch-on-constant filter_var() and filter_var_with_options() with dedicated filter_var_boolean/url/email/ip and filter_var_int_with_range, dropping the FILTER_VALIDATE_* constants and updating all call sites. Co-Authored-By: Claude Opus 4.8 (1M context) --- crates/shirabe/src/package/loader/validating_array_loader.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'crates/shirabe/src/package/loader') diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs index cb7b7ae..1ea51c1 100644 --- a/crates/shirabe/src/package/loader/validating_array_loader.rs +++ b/crates/shirabe/src/package/loader/validating_array_loader.rs @@ -6,10 +6,10 @@ use indexmap::IndexMap; use shirabe_external_packages::composer::pcre::Preg; use shirabe_external_packages::composer::spdx_licenses::SpdxLicenses; use shirabe_php_shim::{ - E_USER_DEPRECATED, FILTER_VALIDATE_EMAIL, PHP_EOL, PhpMixed, array_intersect_key, array_values, - filter_var, get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string, - json_encode, parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, - strtotime, substr, trigger_error, trim, var_export, + E_USER_DEPRECATED, PHP_EOL, PhpMixed, array_intersect_key, array_values, filter_var_email, + get_debug_type, is_array, is_bool, is_int, is_numeric, is_scalar, is_string, json_encode, + parse_url_all, php_to_string, sprintf, str_replace, strcasecmp, strtolower, strtotime, substr, + trigger_error, trim, var_export, }; use shirabe_semver::constraint::AnyConstraint; use shirabe_semver::constraint::MatchNoneConstraint; @@ -314,7 +314,7 @@ impl ValidatingArrayLoader { .and_then(|v| v.as_string()) .map(|s| s.to_string()); if let Some(email_str) = email - && !filter_var(&email_str, FILTER_VALIDATE_EMAIL) + && !filter_var_email(&email_str) { self.warnings.push(format!( "authors.{}.email : invalid value ({}), must be a valid email address", @@ -384,7 +384,7 @@ impl ValidatingArrayLoader { .and_then(|v| v.as_string()) .map(|s| s.to_string()); if let Some(email_str) = support_email - && !filter_var(&email_str, FILTER_VALIDATE_EMAIL) + && !filter_var_email(&email_str) { self.warnings.push(format!( "support.email : invalid value ({}), must be a valid email address", -- cgit v1.3.1