From 112df62a01e482f33b68e1dac190f70085fcec64 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sun, 16 Aug 2026 10:00:50 +0900 Subject: refactor(php-shim): give parse_url a typed UrlComponents result parse_url now returns Option 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) --- crates/shirabe-php-shim/src/stream.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'crates/shirabe-php-shim/src/stream.rs') diff --git a/crates/shirabe-php-shim/src/stream.rs b/crates/shirabe-php-shim/src/stream.rs index bd5e10af..216c68d4 100644 --- a/crates/shirabe-php-shim/src/stream.rs +++ b/crates/shirabe-php-shim/src/stream.rs @@ -84,9 +84,9 @@ pub fn stream_isatty(stream: PhpResource) -> bool { /// `STREAM_IS_URL`; this classifies by the scheme itself, so a registered custom wrapper claiming to /// be local (or vice versa) comes out differently than in PHP. pub fn stream_is_local(path: &str) -> bool { - match crate::parse_url(path, crate::PHP_URL_SCHEME) { - PhpMixed::String(scheme) => scheme.eq_ignore_ascii_case("file"), - _ => true, + match crate::parse_url(path).and_then(|url| url.scheme) { + Some(scheme) => scheme.eq_ignore_ascii_case("file"), + None => true, } } -- cgit v1.3.1-4-g156e