valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some additional PHPStan warnings in UrlHelper.

This commit is contained in:
wn_ 2021-11-11 11:08:04 +00:00
parent bf53dfa515
commit 7a919a79d7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/urlhelper.php
View File

@ -16,7 +16,7 @@ class UrlHelper {
static bool $fetch_curl_used; static bool $fetch_curl_used;
/** /**
* @param array<string, string> $parts * @param array<string, string|int> $parts
*/ */
static function build_url(array $parts): string { static function build_url(array $parts): string {
$tmp = $parts['scheme'] . "://" . $parts['host']; $tmp = $parts['scheme'] . "://" . $parts['host'];
@ -113,6 +113,11 @@ class UrlHelper {
} else { } else {
$tokens['host'] = idn_to_ascii($tokens['host']); $tokens['host'] = idn_to_ascii($tokens['host']);
} }
// if `idn_to_ascii` failed
if ($tokens['host'] === false) {
return false;
}
} }
} }
@ -199,6 +204,7 @@ class UrlHelper {
} }
/** /**
* @param array<string, bool|int|string>|string $options
* @return bool|string false if something went wrong, otherwise string contents * @return bool|string false if something went wrong, otherwise string contents
*/ */
// TODO: max_size currently only works for CURL transfers // TODO: max_size currently only works for CURL transfers
@ -522,7 +528,10 @@ class UrlHelper {
} }
} }
public static function url_to_youtube_vid(string $url) { # : bool|string /**
* @return bool|string false if the provided URL didn't match expected patterns, otherwise the video ID string
*/
public static function url_to_youtube_vid(string $url) {
$url = str_replace("youtube.com", "youtube-nocookie.com", $url); $url = str_replace("youtube.com", "youtube-nocookie.com", $url);
$regexps = [ $regexps = [