aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/util/remote_filesystem.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/remote_filesystem.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/remote_filesystem.rs')
-rw-r--r--crates/shirabe/src/util/remote_filesystem.rs55
1 files changed, 26 insertions, 29 deletions
diff --git a/crates/shirabe/src/util/remote_filesystem.rs b/crates/shirabe/src/util/remote_filesystem.rs
index 1f0b1279..61165b28 100644
--- a/crates/shirabe/src/util/remote_filesystem.rs
+++ b/crates/shirabe/src/util/remote_filesystem.rs
@@ -16,12 +16,11 @@ use indexmap::IndexMap;
use shirabe_pcre::{CaptureKey, Preg};
use shirabe_php_shim::Catch as _;
use shirabe_php_shim::{
- PHP_URL_HOST, PHP_URL_PATH, PHP_URL_SCHEME, PhpMixed, RuntimeException, STREAM_NOTIFY_FAILURE,
- STREAM_NOTIFY_FILE_SIZE_IS, STREAM_NOTIFY_PROGRESS, array_replace_recursive, base64_encode,
- explode, extension_loaded, file_get_contents, file_get_contents5, file_put_contents,
- filter_var_boolean, gethostbyname, http_clear_last_response_headers,
- http_get_last_response_headers, ini_get, json_decode, parse_url, php_regex, preg_quote, strpos,
- strtolower, strtr, substr, trim, zlib_decode,
+ PhpMixed, RuntimeException, STREAM_NOTIFY_FAILURE, STREAM_NOTIFY_FILE_SIZE_IS,
+ STREAM_NOTIFY_PROGRESS, array_replace_recursive, base64_encode, explode, extension_loaded,
+ file_get_contents, file_get_contents5, file_put_contents, filter_var_boolean, gethostbyname,
+ http_clear_last_response_headers, http_get_last_response_headers, ini_get, json_decode,
+ parse_url, php_regex, preg_quote, strpos, strtolower, strtr, substr, trim, zlib_decode,
};
/// Result of `RemoteFilesystem::get` — string content, `true` (for copy), or `false`.
@@ -180,10 +179,9 @@ impl RemoteFilesystem {
file_name: Option<String>,
progress: bool,
) -> anyhow::Result<GetResult> {
- self.scheme = parse_url(&strtr(file_url, "\\", "/"), PHP_URL_SCHEME)
- .as_string()
- .unwrap_or("")
- .to_string();
+ self.scheme = parse_url(&strtr(file_url, "\\", "/"))
+ .and_then(|parsed| parsed.scheme)
+ .unwrap_or_default();
self.bytes_max = 0;
self.origin_url = origin_url.to_string();
self.file_url = file_url.to_string();
@@ -471,9 +469,9 @@ impl RemoteFilesystem {
&& substr(&self.file_url, -4, None) == ".zip"
&& (location_header.is_none()
|| substr(
- parse_url(location_header.as_deref().unwrap_or(""), PHP_URL_PATH)
- .as_string()
- .unwrap_or(""),
+ &parse_url(location_header.as_deref().unwrap_or(""))
+ .and_then(|parsed| parsed.path)
+ .unwrap_or_default(),
-4,
None,
) != ".zip")
@@ -929,23 +927,23 @@ impl RemoteFilesystem {
) -> anyhow::Result<Option<String>> {
let mut target_url: Option<String> = None;
if let Some(location_header) = Response::find_header_value(response_headers, "location") {
- if !parse_url(&location_header, PHP_URL_SCHEME)
- .as_string()
- .unwrap_or("")
- .is_empty()
+ let location_parsed = parse_url(&location_header);
+ if location_parsed
+ .as_ref()
+ .and_then(|parsed| parsed.scheme.as_deref())
+ .is_some_and(|scheme| !scheme.is_empty() && scheme != "0")
{
target_url = Some(location_header);
- } else if parse_url(&location_header, PHP_URL_HOST)
- .as_string()
- .map(|s| !s.is_empty())
- .unwrap_or(false)
+ } else if location_parsed
+ .as_ref()
+ .and_then(|parsed| parsed.host.as_deref())
+ .is_some_and(|host| !host.is_empty() && host != "0")
{
target_url = Some(format!("{}:{}", self.scheme, location_header));
} else if location_header.starts_with('/') {
- let url_host = parse_url(&self.file_url, PHP_URL_HOST)
- .as_string()
- .unwrap_or("")
- .to_string();
+ let url_host = parse_url(&self.file_url)
+ .and_then(|parsed| parsed.host)
+ .unwrap_or_default();
target_url = Some(Preg::replace(
format!(
@@ -980,10 +978,9 @@ impl RemoteFilesystem {
additional_options.insert("redirects".to_string(), PhpMixed::Int(self.redirects));
- let host = parse_url(&target_url, PHP_URL_HOST)
- .as_string()
- .unwrap_or("")
- .to_string();
+ let host = parse_url(&target_url)
+ .and_then(|parsed| parsed.host)
+ .unwrap_or_default();
let res = self.get(
&host,
&target_url,