Merge pull request #11966 from annando/date-correction

[friendica.git] / src / Util / Proxy.php

diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index 16f635e3a04b402e1ac8255f8ced3a2a72589db5..fc7d369ad528d1b4d89f9e9c76aeb6d5c034dfb6 100644 (file)
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -76,11 +76,10 @@ class Proxy
         *
         * @param string $url       The URL to proxyfy
         * @param string $size      One of the Proxy::SIZE_* constants
-        *
         * @return string The proxyfied URL or relative path
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function proxifyUrl($url, $size = '')
+       public static function proxifyUrl(string $url, string $size = ''): string
        {
                if (!DI::config()->get('system', 'proxify_content')) {
                        return $url;
@@ -137,7 +136,7 @@ class Proxy
         * @return string Proxified HTML code
         * @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);
 
@@ -148,10 +147,11 @@ class Proxy
         * Checks if the URL is a local URL.
         *
         * @param string $url
+        *
         * @return boolean
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function isLocalImage($url)
+       public static function isLocalImage(string $url): bool
        {
                if (substr($url, 0, 1) == '/') {
                        return true;
@@ -168,9 +168,10 @@ class Proxy
         * Return the array of query string parameters from a URL
         *
         * @param string $url URL to parse
+        *
         * @return array Associative array of query string parameters
         */
-       private static function parseQuery($url)
+       private static function parseQuery(string $url): array
        {
                $query = parse_url($url, PHP_URL_QUERY);
                $query = html_entity_decode($query);
@@ -184,10 +185,11 @@ class Proxy
         * Call-back method to replace the UR
         *
         * @param array $matches Matches from preg_replace_callback()
+        *
         * @return string Proxified HTML image tag
         * @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
                $queryvar = self::parseQuery($matches[2]);