Make "HTTPRequest::fetchUrlFull" dynamic

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 9403d3eb7fa64b0f3cff176425eb3a60efa938b9..96f26838ed7c7a71c99e24a52da5e0adf398aaf1 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -126,7 +126,7 @@ function pubsubhubbub_init(App $a) {
                $hub_callback = rtrim($hub_callback, ' ?&#');
                $separator = parse_url($hub_callback, PHP_URL_QUERY) === null ? '?' : '&';
 
-               $fetchResult = HTTPRequest::fetchUrlFull($hub_callback . $separator . $params);
+               $fetchResult = DI::httpRequest()->fetchUrlFull($hub_callback . $separator . $params);
                $body = $fetchResult->getBody();
                $ret = $fetchResult->getReturnCode();
 

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 7b6291ff39961a6802992f5ab09b48df6f811f8a..af7c7aa496ace48c8c2d0182cbfde69b53710db3 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -548,11 +548,11 @@ class Installer
                $help = "";
                $error_msg = "";
                if (function_exists('curl_init')) {
-                       $fetchResult = HTTPRequest::fetchUrlFull($baseurl . "/install/testrewrite");
+                       $fetchResult = DI::httpRequest()->fetchUrlFull($baseurl . "/install/testrewrite");
 
                        $url = Strings::normaliseLink($baseurl . "/install/testrewrite");
                        if ($fetchResult->getReturnCode() != 204) {
-                               $fetchResult = HTTPRequest::fetchUrlFull($url);
+                               $fetchResult = DI::httpRequest()->fetchUrlFull($url);
                        }
 
                        if ($fetchResult->getReturnCode() != 204) {

diff --git a/src/Network/HTTPRequest.php b/src/Network/HTTPRequest.php
index 131fac8a78f896e2baf82ca24d5abf896884045e..14395c37f3237c2ca3e1b2d0e87e59d333e2d0e1 100644 (file)
--- a/src/Network/HTTPRequest.php
+++ b/src/Network/HTTPRequest.php
@@ -365,9 +365,9 @@ class HTTPRequest
         * @return CurlResult With all relevant information, 'body' contains the actual fetched content.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
-       public static function fetchUrlFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
+       public function fetchUrlFull(string $url, bool $binary = false, int $timeout = 0, string $accept_content = '', string $cookiejar = '', int &$redirects = 0)
        {
-               return self::curl(
+               return $this->curl(
                        $url,
                        $binary,
                        [

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 0284c9b8aa7dcd72c379ecaeef5707f81225cb84..f118ffa9490c9145ccc856820517640041d58f6e 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -103,7 +103,7 @@ class PortableContact
 
                Logger::log('load: ' . $url, Logger::DEBUG);
 
-               $fetchresult = HTTPRequest::fetchUrlFull($url);
+               $fetchresult = DI::httpRequest()->fetchUrlFull($url);
                $s = $fetchresult->getBody();
 
                Logger::log('load: returns ' . $s, Logger::DATA);