From 3b4cf87c95a6a2b5ca46b2fbcb65c4e9e0e94dbc Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Wed, 4 Mar 2020 22:19:59 +0100
Subject: [PATCH] Make "HTTPRequest::fetchUrlFull" dynamic

---
 mod/pubsubhubbub.php             | 2 +-
 src/Core/Installer.php           | 4 ++--
 src/Network/HTTPRequest.php      | 4 ++--
 src/Protocol/PortableContact.php | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 9403d3eb7f..96f26838ed 100644
--- 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 7b6291ff39..af7c7aa496 100644
--- 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 131fac8a78..14395c37f3 100644
--- 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 0284c9b8aa..f118ffa949 100644
--- 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);