From fb208bb136de79b5d84b3343493eef635cf0269a Mon Sep 17 00:00:00 2001 From: wn_ Date: Mon, 15 Nov 2021 03:28:17 +0000 Subject: Fix a PHPStan warning in 'UrlHelper::rewrite_relative()'. --- classes/urlhelper.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'classes/urlhelper.php') diff --git a/classes/urlhelper.php b/classes/urlhelper.php index 5d0d80a41..91e1d4822 100644 --- a/classes/urlhelper.php +++ b/classes/urlhelper.php @@ -53,12 +53,22 @@ class UrlHelper { * @param string $owner_element Owner element tag name (i.e. "a") (optional) * @param string $owner_attribute Owner attribute (i.e. "href") (optional) * - * @return string Absolute URL + * @return false|string Absolute URL or false on failure (either during URL parsing or validation) */ public static function rewrite_relative($base_url, $rel_url, string $owner_element = "", string $owner_attribute = "") { - $rel_parts = parse_url($rel_url); + /** + * If parse_url failed to parse $rel_url return false to match the current "invalid thing" behavior + * of UrlHelper::validate(). + * + * TODO: There are many places where a string return value is assumed. We should either update those + * to account for the possibility of failure, or look into updating this function's return values. + */ + if ($rel_parts === false) { + return false; + } + if (!empty($rel_parts['host']) && !empty($rel_parts['scheme'])) { return self::validate($rel_url); -- cgit v1.2.3