aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/package
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-16 10:00:50 +0900
committernsfisis <nsfisis@gmail.com>2026-08-16 10:00:50 +0900
commit112df62a01e482f33b68e1dac190f70085fcec64 (patch)
tree19d126032309193cfd5f5d0fb63b6562ef17e5c9 /crates/shirabe/src/package
parent3fb08fab7ca69a028a9a89544b246ca70534cbce (diff)
downloadphp-shirabe-112df62a01e482f33b68e1dac190f70085fcec64.tar.gz
php-shirabe-112df62a01e482f33b68e1dac190f70085fcec64.tar.zst
php-shirabe-112df62a01e482f33b68e1dac190f70085fcec64.zip
refactor(php-shim): give parse_url a typed UrlComponents result
parse_url now returns Option<UrlComponents> instead of a PhpMixed array, and the component-selecting overload with the PHP_URL_* constants is gone: callers read the field they want. Two call sites change behaviour as a result, both towards PHP: * CurlDownloader::handle_redirect tested scheme and host with is_null(), so an unparsable Location header (PhpMixed::Bool(false)) counted as an absolute URL. PHP's truthiness test sends it to the relative-path branch. * Url::get_origin appended a literal port 0, which PHP treats as falsy and leaves off. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/package')
-rw-r--r--crates/shirabe/src/package/loader/validating_array_loader.rs20
1 files changed, 6 insertions, 14 deletions
diff --git a/crates/shirabe/src/package/loader/validating_array_loader.rs b/crates/shirabe/src/package/loader/validating_array_loader.rs
index 66123b58..6b9bea91 100644
--- a/crates/shirabe/src/package/loader/validating_array_loader.rs
+++ b/crates/shirabe/src/package/loader/validating_array_loader.rs
@@ -11,7 +11,7 @@ use shirabe_pcre::Preg;
use shirabe_php_shim::{
CmpOp, 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_regex, php_to_string, str_replace, strcasecmp, strtolower,
+ json_encode, parse_url, php_regex, php_to_string, str_replace, strcasecmp, strtolower,
strtotime, substr, trigger_error, trim, var_export,
};
use shirabe_semver::Intervals;
@@ -299,24 +299,16 @@ impl ValidatingArrayLoader {
return true;
}
- let bits = parse_url_all(value);
- let bits_map = match bits {
- PhpMixed::Array(m) => m,
- _ => return false,
+ let Some(bits) = parse_url(value) else {
+ return false;
};
- let scheme = bits_map
- .get("scheme")
- .and_then(|v| v.as_string())
- .unwrap_or("");
- let host = bits_map
- .get("host")
- .and_then(|v| v.as_string())
- .unwrap_or("");
+ let scheme = bits.scheme.unwrap_or_default();
+ let host = bits.host.unwrap_or_default();
if scheme.is_empty() || host.is_empty() {
return false;
}
- if !schemes.contains(&scheme) {
+ if !schemes.contains(&scheme.as_str()) {
return false;
}