aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/url.rs
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/util/url.rs
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/util/url.rs')
-rw-r--r--crates/shirabe/src/util/url.rs21
1 files changed, 11 insertions, 10 deletions
diff --git a/crates/shirabe/src/util/url.rs b/crates/shirabe/src/util/url.rs
index c7cbd228..ea9e4401 100644
--- a/crates/shirabe/src/util/url.rs
+++ b/crates/shirabe/src/util/url.rs
@@ -4,17 +4,14 @@ use crate::config::Config;
use crate::util::GitHub;
use indexmap::IndexMap;
use shirabe_pcre::{CaptureKey, Preg};
-use shirabe_php_shim::{
- PHP_URL_HOST, PHP_URL_PORT, PhpMixed, in_array_strict, parse_url, php_regex,
-};
+use shirabe_php_shim::{PhpMixed, in_array_strict, parse_url, php_regex};
pub struct Url;
impl Url {
pub fn update_dist_reference(config: &Config, mut url: String, r#ref: &str) -> String {
- let host = parse_url(&url, PHP_URL_HOST)
- .as_string()
- .map(|s| s.to_string())
+ let host = parse_url(&url)
+ .and_then(|parsed| parsed.host)
.unwrap_or_default();
if host == "api.github.com" || host == "github.com" || host == "www.github.com" {
@@ -121,11 +118,15 @@ impl Url {
return url.to_string();
}
- let mut origin = parse_url(url, PHP_URL_HOST)
- .as_string()
- .map(|s| s.to_string())
+ let parsed = parse_url(url);
+ let mut origin = parsed
+ .as_ref()
+ .and_then(|parsed| parsed.host.clone())
.unwrap_or_default();
- if let Some(port) = parse_url(url, PHP_URL_PORT).as_int() {
+ if let Some(port) = parsed
+ .and_then(|parsed| parsed.port)
+ .filter(|port| *port != 0)
+ {
origin = format!("{}:{}", origin, port);
}