More type-hints added
This commit is contained in:
parent
182c3db9b8
commit
57e741f2cf
1 changed files with 3 additions and 5 deletions
|
@ -76,11 +76,10 @@ class Proxy
|
||||||
*
|
*
|
||||||
* @param string $url The URL to proxyfy
|
* @param string $url The URL to proxyfy
|
||||||
* @param string $size One of the Proxy::SIZE_* constants
|
* @param string $size One of the Proxy::SIZE_* constants
|
||||||
*
|
|
||||||
* @return string The proxyfied URL or relative path
|
* @return string The proxyfied URL or relative path
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public static function proxifyUrl(string $url, string $size = '')
|
public static function proxifyUrl(string $url, string $size = ''): string
|
||||||
{
|
{
|
||||||
if (!DI::config()->get('system', 'proxify_content')) {
|
if (!DI::config()->get('system', 'proxify_content')) {
|
||||||
return $url;
|
return $url;
|
||||||
|
@ -133,11 +132,10 @@ class Proxy
|
||||||
* proxy storage directory.
|
* proxy storage directory.
|
||||||
*
|
*
|
||||||
* @param string $html Un-proxified HTML code
|
* @param string $html Un-proxified HTML code
|
||||||
*
|
|
||||||
* @return string Proxified HTML code
|
* @return string Proxified HTML code
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
public static function proxifyHtml($html)
|
public static function proxifyHtml(string $html): string
|
||||||
{
|
{
|
||||||
$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
|
$html = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/', DI::baseUrl() . '/', $html);
|
||||||
|
|
||||||
|
@ -187,7 +185,7 @@ class Proxy
|
||||||
* @return string Proxified HTML image tag
|
* @return string Proxified HTML image tag
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||||
*/
|
*/
|
||||||
private static function replaceUrl(array $matches)
|
private static function replaceUrl(array $matches): string
|
||||||
{
|
{
|
||||||
// if the picture seems to be from another picture cache then take the original source
|
// if the picture seems to be from another picture cache then take the original source
|
||||||
$queryvar = self::parseQuery($matches[2]);
|
$queryvar = self::parseQuery($matches[2]);
|
||||||
|
|
Loading…
Reference in a new issue