Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-05 17:44:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

"Network::unparseURL" is replaced with "Uri::fromParts"

Browse source
This commit is contained in:
Michael 2024-05-14 21:47:57 +00:00
parent a6f3c961dc
commit 1c66d49599
9 changed files with 17 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/Util/Network.php
View file

@ -400,7 +400,7 @@ class Network
];
$parts = array_merge($base, parse_url('/' . ltrim($url, '/')));
return self::unparseURL($parts);
return (string)Uri::fromParts((array)$parts);
}
/**
@ -492,38 +492,6 @@ class Network
return Strings::normaliseLink($match);
}
/**
* Glue url parts together
*
* @param array $parsed URL parts
*
* @return string|null The glued URL or null on error
* @deprecated since version 2021.12, use GuzzleHttp\Psr7\Uri::fromParts($parts) instead
*/
public static function unparseURL(array $parsed): string
{
$get = function ($key) use ($parsed) {
return isset($parsed[$key]) ? $parsed[$key] : null;
};
$pass = $get('pass');
$user = $get('user');
$userinfo = $pass !== null ? "$user:$pass" : $user;
$port = $get('port');
$scheme = $get('scheme');
$query = $get('query');
$fragment = $get('fragment');
$authority = ($userinfo !== null ? $userinfo . '@' : '') .
$get('host') .
($port ? ":$port" : '');
return (!empty($scheme) ? $scheme . ':' : '') .
(!empty($authority) ? '//' . $authority : '') .
$get('path') .
(!empty($query) ? '?' . $query : '') .
(!empty($fragment) ? '#' . $fragment : '');
}
/**
* Convert an URI to an IDN compatible URI
*
@ -602,7 +570,7 @@ class Network
$parsed['query'] = http_build_query($params);
return self::unparseURL($parsed);
return (string)Uri::fromParts((array)$parsed);
}
/**