Rename DI::httpRequest() into DI::httpClient()

diff --git a/mod/match.php b/mod/match.php
index fcaf8b529de5761bfd6702cea84bd733f6e4d8a9..5f74b8d3a439955968202c13fb6536dc3fea589e 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -83,7 +83,7 @@ function match_content(App $a)
                        continue;
                }
 
-               $msearch = json_decode(DI::httpRequest()->post($server . '/msearch', $params)->getBody());
+               $msearch = json_decode(DI::httpClient()->post($server . '/msearch', $params)->getBody());
                if (!empty($msearch)) {
                        $entries = match_get_contacts($msearch, $entries, $limit);
                }

diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 57f8b9a738c3a2b654ca4ae0b302070414e409d5..20ac8a36e86289b891da8606ed138df1deadf81e 100644 (file)
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -57,7 +57,7 @@ function ostatus_subscribe_content(App $a)
                        $api = $contact['baseurl'] . '/api/';
 
                        // Fetching friends
-                       $curlResult = DI::httpRequest()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
+                       $curlResult = DI::httpClient()->get($api . 'statuses/friends.json?screen_name=' . $contact['nick']);
 
                        if (!$curlResult->isSuccess()) {
                                DI::pConfig()->delete($uid, 'ostatus', 'legacy_contact');

diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 8689ae373cf5d3e8ef8be5db13b730e26100fa76..bc90c76d66533ca5ec1df66557637c2bf7b6e583 100644 (file)
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -125,7 +125,7 @@ function pubsubhubbub_init(App $a) {
                $hub_callback = rtrim($hub_callback, ' ?&#');
                $separator = parse_url($hub_callback, PHP_URL_QUERY) === null ? '?' : '&';
 
-               $fetchResult = DI::httpRequest()->fetchFull($hub_callback . $separator . $params);
+               $fetchResult = DI::httpClient()->fetchFull($hub_callback . $separator . $params);
                $body = $fetchResult->getBody();
                $ret = $fetchResult->getReturnCode();
 

diff --git a/mod/redir.php b/mod/redir.php
index bef67300f52ff2c420811a6b811996bed1314897..a158f31798cdf01313268c616e608b506ead8e05 100644 (file)
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -142,7 +142,7 @@ function redir_magic($a, $cid, $url)
        }
 
        // Test for magic auth on the target system
-       $serverret = DI::httpRequest()->get($basepath . '/magic');
+       $serverret = DI::httpClient()->get($basepath . '/magic');
        if ($serverret->isSuccess()) {
                $separator = strpos($target_url, '?') ? '&' : '?';
                $target_url .= $separator . 'zrl=' . urlencode($visitor) . '&addr=' . urlencode($contact_url);

diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index 5390a4bc5730165c503a2cb4c4f8612b05221975..e97afdc483ba24e2cec69b1b7de8d10efa026dad 100644 (file)
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -97,7 +97,7 @@ class OEmbed
 
                        if (!in_array($ext, $noexts)) {
                                // try oembed autodiscovery
-                               $html_text = DI::httpRequest()->fetch($embedurl, 15, 'text/*');
+                               $html_text = DI::httpClient()->fetch($embedurl, 15, 'text/*');
                                if (!empty($html_text)) {
                                        $dom = new DOMDocument();
                                        if (@$dom->loadHTML($html_text)) {
@@ -111,7 +111,7 @@ class OEmbed
                                                        // but their OEmbed endpoint is only accessible by HTTPS ¯\_(ツ)_/¯
                                                        $href = str_replace(['http://www.youtube.com/', 'http://player.vimeo.com/'],
                                                                ['https://www.youtube.com/', 'https://player.vimeo.com/'], $href);
-                                                       $result = DI::httpRequest()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
+                                                       $result = DI::httpClient()->fetchFull($href . '&maxwidth=' . $a->getThemeInfoValue('videowidth'));
                                                        if ($result->getReturnCode() === 200) {
                                                                $json_string = $result->getBody();
                                                                break;

diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 17be02d22f518d9ce206ded97dab387843afb614..5a2b966dd57c2ce6501522409e111e84d9c263ed 100644 (file)
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -494,7 +494,7 @@ class BBCode
                                        continue;
                                }
 
-                               $curlResult = DI::httpRequest()->get($mtch[1]);
+                               $curlResult = DI::httpClient()->get($mtch[1]);
                                if (!$curlResult->isSuccess()) {
                                        continue;
                                }
@@ -1194,7 +1194,7 @@ class BBCode
                $text = DI::cache()->get($cache_key);
 
                if (is_null($text)) {
-                       $curlResult = DI::httpRequest()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+                       $curlResult = DI::httpClient()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
                        if ($curlResult->isSuccess()) {
                                $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
                        } else {
@@ -1207,7 +1207,7 @@ class BBCode
                                $text = "[url=" . $match[2] . ']' . $match[2] . "[/url]";
 
                                // if its not a picture then look if its a page that contains a picture link
-                               $body = DI::httpRequest()->fetch($match[1]);
+                               $body = DI::httpClient()->fetch($match[1]);
                                if (empty($body)) {
                                        DI::cache()->set($cache_key, $text);
                                        return $text;
@@ -1265,7 +1265,7 @@ class BBCode
                        return $text;
                }
 
-               $curlResult = DI::httpRequest()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
+               $curlResult = DI::httpClient()->head($match[1], [HTTPClientOptions::TIMEOUT => DI::config()->get('system', 'xrd_timeout')]);
                if ($curlResult->isSuccess()) {
                        $mimetype = $curlResult->getHeader('Content-Type')[0] ?? '';
                } else {
@@ -1283,7 +1283,7 @@ class BBCode
                        }
 
                        // if its not a picture then look if its a page that contains a picture link
-                       $body = DI::httpRequest()->fetch($match[1]);
+                       $body = DI::httpClient()->fetch($match[1]);
                        if (empty($body)) {
                                DI::cache()->set($cache_key, $text);
                                return $text;

diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 041771812526fe028b8e7cda42d7137f7e54ec33..96fe941564b915f0d2e12b631ac53680bcd38007 100644 (file)
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -557,11 +557,11 @@ class Installer
                $help = "";
                $error_msg = "";
                if (function_exists('curl_init')) {
-                       $fetchResult = DI::httpRequest()->fetchFull($baseurl . "/install/testrewrite");
+                       $fetchResult = DI::httpClient()->fetchFull($baseurl . "/install/testrewrite");
 
                        $url = Strings::normaliseLink($baseurl . "/install/testrewrite");
                        if ($fetchResult->getReturnCode() != 204) {
-                               $fetchResult = DI::httpRequest()->fetchFull($url);
+                               $fetchResult = DI::httpClient()->fetchFull($url);
                        }
 
                        if ($fetchResult->getReturnCode() != 204) {

diff --git a/src/Core/Protocol.php b/src/Core/Protocol.php
index 860ac26be68beff9ecfe1d9b01d9b2b5105574e0..b0bf72aeb37590e508b00c60a2203d2040f497db 100644 (file)
--- a/src/Core/Protocol.php
+++ b/src/Core/Protocol.php
@@ -122,7 +122,7 @@ class Protocol
                if (preg_match('=https?://(.*)/user/(.*)=ism', $profile_url, $matches)) {
                        $statusnet_host = $matches[1];
                        $statusnet_user = $matches[2];
-                       $UserData = DI::httpRequest()->fetch('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
+                       $UserData = DI::httpClient()->fetch('http://' . $statusnet_host . '/api/users/show.json?user_id=' . $statusnet_user);
                        $user = json_decode($UserData);
                        if ($user) {
                                $matches[2] = $user->screen_name;

diff --git a/src/Core/Search.php b/src/Core/Search.php
index d3bf0b5ba52afde51db4a6c913d40e1d75cf3f93..ff4abdfacfb4cfcff9e7ba8c9d0696a4ae68539c 100644 (file)
--- a/src/Core/Search.php
+++ b/src/Core/Search.php
@@ -122,7 +122,7 @@ class Search
                        $searchUrl .= '&page=' . $page;
                }
 
-               $resultJson = DI::httpRequest()->fetch($searchUrl, 0, 'application/json');
+               $resultJson = DI::httpClient()->fetch($searchUrl, 0, 'application/json');
 
                $results = json_decode($resultJson, true);
 
@@ -228,7 +228,7 @@ class Search
                        $return = Contact::searchByName($search, $mode);
                } else {
                        $p = $page > 1 ? 'p=' . $page : '';
-                       $curlResult = DI::httpRequest()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HTTPClientOptions::ACCEPT_CONTENT => ['application/json']]);
+                       $curlResult = DI::httpClient()->get(self::getGlobalDirectory() . '/search/people?' . $p . '&q=' . urlencode($search), [HTTPClientOptions::ACCEPT_CONTENT => ['application/json']]);
                        if ($curlResult->isSuccess()) {
                                $searchResult = json_decode($curlResult->getBody(), true);
                                if (!empty($searchResult['profiles'])) {

diff --git a/src/DI.php b/src/DI.php
index 7f6f28f33cb45257772361a6524a27ceb76e678d..4645ea252db915cfe171c8cccad5771fa4f8c18d 100644 (file)
--- a/src/DI.php
+++ b/src/DI.php
@@ -420,7 +420,7 @@ abstract class DI
        /**
         * @return Network\IHTTPClient
         */
-       public static function httpRequest()
+       public static function httpClient()
        {
                return self::$dice->create(Network\IHTTPClient::class);
        }

diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index da4867e03e73550581bb8952fc758784552927d7..d7a6cacbdc250aaca26d70523cd0676c7311d104 100644 (file)
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -315,7 +315,7 @@ class GServer
 
                // When a nodeinfo is present, we don't need to dig further
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->get($url . '/.well-known/nodeinfo', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpClient()->get($url . '/.well-known/nodeinfo', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                if ($curlResult->isTimeout()) {
                        self::setFailure($url);
                        return false;
@@ -323,7 +323,7 @@ class GServer
 
                // On a redirect follow the new host but mark the old one as failure
                if ($curlResult->isSuccess() && (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
-                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+                       $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                        if (parse_url($url, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST)) {
                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
                                self::setFailure($url);
@@ -359,7 +359,7 @@ class GServer
                                        $basedata = ['detection-method' => self::DETECT_MANUAL];
                                }
 
-                               $curlResult = DI::httpRequest()->get($baseurl, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+                               $curlResult = DI::httpClient()->get($baseurl, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                                if ($curlResult->isSuccess()) {
                                        if ((parse_url($baseurl, PHP_URL_HOST) != parse_url($curlResult->getRedirectUrl(), PHP_URL_HOST))) {
                                                Logger::info('Found redirect. Mark old entry as failure', ['old' => $url, 'new' => $curlResult->getRedirectUrl()]);
@@ -383,7 +383,7 @@ class GServer
                                        // When the base path doesn't seem to contain a social network we try the complete path.
                                        // Most detectable system have to be installed in the root directory.
                                        // We checked the base to avoid false positives.
-                                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+                                       $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                                        if ($curlResult->isSuccess()) {
                                                $urldata = self::analyseRootHeader($curlResult, $serverdata);
                                                $urldata = self::analyseRootBody($curlResult, $urldata, $url);
@@ -527,7 +527,7 @@ class GServer
        {
                Logger::info('Discover relay data', ['server' => $server_url]);
 
-               $curlResult = DI::httpRequest()->get($server_url . '/.well-known/x-social-relay');
+               $curlResult = DI::httpClient()->get($server_url . '/.well-known/x-social-relay');
                if (!$curlResult->isSuccess()) {
                        return;
                }
@@ -622,7 +622,7 @@ class GServer
         */
        private static function fetchStatistics(string $url)
        {
-               $curlResult = DI::httpRequest()->get($url . '/statistics.json');
+               $curlResult = DI::httpClient()->get($url . '/statistics.json');
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -733,7 +733,7 @@ class GServer
         */
        private static function parseNodeinfo1(string $nodeinfo_url)
        {
-               $curlResult = DI::httpRequest()->get($nodeinfo_url);
+               $curlResult = DI::httpClient()->get($nodeinfo_url);
 
                if (!$curlResult->isSuccess()) {
                        return [];
@@ -811,7 +811,7 @@ class GServer
         */
        private static function parseNodeinfo2(string $nodeinfo_url)
        {
-               $curlResult = DI::httpRequest()->get($nodeinfo_url);
+               $curlResult = DI::httpClient()->get($nodeinfo_url);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -890,7 +890,7 @@ class GServer
         */
        private static function fetchSiteinfo(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/siteinfo.json');
+               $curlResult = DI::httpClient()->get($url . '/siteinfo.json');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -959,7 +959,7 @@ class GServer
        private static function validHostMeta(string $url)
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout');
-               $curlResult = DI::httpRequest()->get($url . '/.well-known/host-meta', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
+               $curlResult = DI::httpClient()->get($url . '/.well-known/host-meta', [HTTPClientOptions::TIMEOUT => $xrd_timeout]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -1049,7 +1049,7 @@ class GServer
        {
                $serverdata['poco'] = '';
 
-               $curlResult = DI::httpRequest()->get($url . '/poco');
+               $curlResult = DI::httpClient()->get($url . '/poco');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1079,7 +1079,7 @@ class GServer
         */
        public static function checkMastodonDirectory(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/api/v1/directory?limit=1');
+               $curlResult = DI::httpClient()->get($url . '/api/v1/directory?limit=1');
                if (!$curlResult->isSuccess()) {
                        return $serverdata;
                }
@@ -1106,7 +1106,7 @@ class GServer
         */
        private static function detectPeertube(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/api/v1/config');
+               $curlResult = DI::httpClient()->get($url . '/api/v1/config');
 
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
@@ -1154,7 +1154,7 @@ class GServer
         */
        private static function detectNextcloud(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/status.php');
+               $curlResult = DI::httpClient()->get($url . '/status.php');
 
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
@@ -1188,7 +1188,7 @@ class GServer
         */
        private static function detectMastodonAlikes(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/api/v1/instance');
+               $curlResult = DI::httpClient()->get($url . '/api/v1/instance');
 
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
@@ -1254,7 +1254,7 @@ class GServer
         */
        private static function detectHubzilla(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/api/statusnet/config.json');
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/config.json');
                if (!$curlResult->isSuccess() || ($curlResult->getBody() == '')) {
                        return $serverdata;
                }
@@ -1352,7 +1352,7 @@ class GServer
        private static function detectGNUSocial(string $url, array $serverdata)
        {
                // Test for GNU Social
-               $curlResult = DI::httpRequest()->get($url . '/api/gnusocial/version.json');
+               $curlResult = DI::httpClient()->get($url . '/api/gnusocial/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
                        $serverdata['platform'] = 'gnusocial';
@@ -1370,7 +1370,7 @@ class GServer
                }
 
                // Test for Statusnet
-               $curlResult = DI::httpRequest()->get($url . '/api/statusnet/version.json');
+               $curlResult = DI::httpClient()->get($url . '/api/statusnet/version.json');
                if ($curlResult->isSuccess() && ($curlResult->getBody() != '{"error":"not implemented"}') &&
                        ($curlResult->getBody() != '') && (strlen($curlResult->getBody()) < 30)) {
 
@@ -1406,9 +1406,9 @@ class GServer
         */
        private static function detectFriendica(string $url, array $serverdata)
        {
-               $curlResult = DI::httpRequest()->get($url . '/friendica/json');
+               $curlResult = DI::httpClient()->get($url . '/friendica/json');
                if (!$curlResult->isSuccess()) {
-                       $curlResult = DI::httpRequest()->get($url . '/friendika/json');
+                       $curlResult = DI::httpClient()->get($url . '/friendika/json');
                        $friendika = true;
                        $platform = 'Friendika';
                } else {
@@ -1712,7 +1712,7 @@ class GServer
                $protocols = ['activitypub', 'diaspora', 'dfrn', 'ostatus'];
                foreach ($protocols as $protocol) {
                        $query = '{nodes(protocol:"' . $protocol . '"){host}}';
-                       $curlResult = DI::httpRequest()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
+                       $curlResult = DI::httpClient()->fetch('https://the-federation.info/graphql?query=' . urlencode($query));
                        if (!empty($curlResult)) {
                                $data = json_decode($curlResult, true);
                                if (!empty($data['data']['nodes'])) {
@@ -1729,7 +1729,7 @@ class GServer
 
                if (!empty($accesstoken)) {
                        $api = 'https://instances.social/api/1.0/instances/list?count=0';
-                       $curlResult = DI::httpRequest()->get($api, [HTTPClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
+                       $curlResult = DI::httpClient()->get($api, [HTTPClientOptions::HEADERS => ['Authorization' => ['Bearer ' . $accesstoken]]]);
 
                        if ($curlResult->isSuccess()) {
                                $servers = json_decode($curlResult->getBody(), true);

diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index 23e0b9a38c660e67e80649aec41fadd7011a27c4..039fee779a9943bbe53edb53ac5931026e69296d 100644 (file)
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -490,7 +490,7 @@ class Photo
 
                $filename = basename($image_url);
                if (!empty($image_url)) {
-                       $ret = DI::httpRequest()->get($image_url);
+                       $ret = DI::httpClient()->get($image_url);
                        $img_str = $ret->getBody();
                        $type = $ret->getContentType();
                } else {

diff --git a/src/Model/Post/Link.php b/src/Model/Post/Link.php
index c724eff259302f81e0c32a39472465d3916d8cbc..dce9dcf151610ce09d1c36bcc5caa003d7e9e030 100644 (file)
--- a/src/Model/Post/Link.php
+++ b/src/Model/Post/Link.php
@@ -88,7 +88,7 @@ class Link
        {
                $timeout = DI::config()->get('system', 'xrd_timeout');
 
-               $curlResult = DI::httpRequest()->head($url, [HTTPClientOptions::TIMEOUT => $timeout]);
+               $curlResult = DI::httpClient()->head($url, [HTTPClientOptions::TIMEOUT => $timeout]);
                if ($curlResult->isSuccess()) {
                        if (empty($media['mimetype'])) {
                                return $curlResult->getHeader('Content-Type')[0] ?? '';

diff --git a/src/Model/Post/Media.php b/src/Model/Post/Media.php
index fd6ca40250769952b9b5865018f9385467d5b82a..ada1cc070a2ca942abdb8eb3e7abe477b020b17f 100644 (file)
--- a/src/Model/Post/Media.php
+++ b/src/Model/Post/Media.php
@@ -168,7 +168,7 @@ class Media
                // Fetch the mimetype or size if missing.
                if (empty($media['mimetype']) || empty($media['size'])) {
                        $timeout = DI::config()->get('system', 'xrd_timeout');
-                       $curlResult = DI::httpRequest()->head($media['url'], [HTTPClientOptions::TIMEOUT => $timeout]);
+                       $curlResult = DI::httpClient()->head($media['url'], [HTTPClientOptions::TIMEOUT => $timeout]);
                        if ($curlResult->isSuccess()) {
                                if (empty($media['mimetype'])) {
                                        $media['mimetype'] = $curlResult->getHeader('Content-Type')[0] ?? '';

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 660cc5fb3d135d60870ba21116af68091119db38..a1e97d1ee464273aea874fb902eda9da976ff3f9 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -742,7 +742,7 @@ class Profile
                        $magic_path = $basepath . '/magic' . '?owa=1&dest=' . $dest . '&' . $addr_request;
 
                        // We have to check if the remote server does understand /magic without invoking something
-                       $serverret = DI::httpRequest()->get($basepath . '/magic');
+                       $serverret = DI::httpClient()->get($basepath . '/magic');
                        if ($serverret->isSuccess()) {
                                Logger::log('Doing magic auth for visitor ' . $my_url . ' to ' . $magic_path, Logger::DEBUG);
                                System::externalRedirect($magic_path);

diff --git a/src/Model/User.php b/src/Model/User.php
index 5af5f7f58266b414622b67c1ec280f72ff95f8d5..4f63b381988e688c612baae21b491c822799d49b 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -1098,7 +1098,7 @@ class User
                        $photo_failure = false;
 
                        $filename = basename($photo);
-                       $curlResult = DI::httpRequest()->get($photo);
+                       $curlResult = DI::httpClient()->get($photo);
                        if ($curlResult->isSuccess()) {
                                $img_str = $curlResult->getBody();
                                $type = $curlResult->getContentType();

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 68b9ad939025013271f18859053f811497a6d0d7..1c5785d1fec8ec4ca6c1d9af33003944a2944b21 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -248,7 +248,7 @@ class Summary extends BaseAdmin
        private static function checkSelfHostMeta()
        {
                // Fetch the host-meta to check if this really is a vital server
-               return DI::httpRequest()->get(DI::baseUrl()->get() . '/.well-known/host-meta')->isSuccess();
+               return DI::httpClient()->get(DI::baseUrl()->get() . '/.well-known/host-meta')->isSuccess();
        }
 
 }

diff --git a/src/Module/Debug/Feed.php b/src/Module/Debug/Feed.php
index 37504b0783654e6dc6f69df0f8e4a3e2b6ca623d..5ef6816682c4abc9793fc6fb43525e895306d8cf 100644 (file)
--- a/src/Module/Debug/Feed.php
+++ b/src/Module/Debug/Feed.php
@@ -48,7 +48,7 @@ class Feed extends BaseModule
 
                        $contact = Model\Contact::getByURLForUser($url, local_user(), null);
 
-                       $xml = DI::httpRequest()->fetch($contact['poll']);
+                       $xml = DI::httpClient()->fetch($contact['poll']);
 
                        $import_result = Protocol\Feed::import($xml);
 

diff --git a/src/Module/Magic.php b/src/Module/Magic.php
index 5aeced8d7f2bb50b5fbeb1d6cb2439cede330362..d508835b024717163ed09d7dcb232313055e769c 100644 (file)
--- a/src/Module/Magic.php
+++ b/src/Module/Magic.php
@@ -102,7 +102,7 @@ class Magic extends BaseModule
                        );
 
                        // Try to get an authentication token from the other instance.
-                       $curlResult = DI::httpRequest()->get($basepath . '/owa', [HTTPClientOptions::HEADERS => $header]);
+                       $curlResult = DI::httpClient()->get($basepath . '/owa', [HTTPClientOptions::HEADERS => $header]);
 
                        if ($curlResult->isSuccess()) {
                                $j = json_decode($curlResult->getBody(), true);

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 961a96e16af9a64a0e0e386ed3e395a0873ef889..8aa15a13c31152f99fe612fae4335d406611dc02 100644 (file)
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -170,7 +170,7 @@ class Probe
                Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
                $xrd = null;
 
-               $curlResult = DI::httpRequest()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+               $curlResult = DI::httpClient()->get($ssl_url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                $ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                if ($curlResult->isSuccess()) {
                        $xml = $curlResult->getBody();
@@ -187,7 +187,7 @@ class Probe
                }
 
                if (!is_object($xrd) && !empty($url)) {
-                       $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
+                       $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => ['application/xrd+xml']]);
                        $connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
                        if ($curlResult->isTimeout()) {
                                Logger::info('Probing timeout', ['url' => $url]);
@@ -424,7 +424,7 @@ class Probe
         */
        private static function getHideStatus($url)
        {
-               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess()) {
                        return false;
                }
@@ -843,7 +843,7 @@ class Probe
 
        public static function pollZot($url, $data)
        {
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
                if ($curlResult->isTimeout()) {
                        return $data;
                }
@@ -940,7 +940,7 @@ class Probe
        {
                $xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
+               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::TIMEOUT => $xrd_timeout, HTTPClientOptions::ACCEPT_CONTENT => [$type]]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1009,7 +1009,7 @@ class Probe
         */
        private static function pollNoscrape($noscrape_url, $data)
        {
-               $curlResult = DI::httpRequest()->get($noscrape_url);
+               $curlResult = DI::httpClient()->get($noscrape_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return $data;
@@ -1275,7 +1275,7 @@ class Probe
         */
        private static function pollHcard($hcard_url, $data, $dfrn = false)
        {
-               $curlResult = DI::httpRequest()->get($hcard_url);
+               $curlResult = DI::httpClient()->get($hcard_url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1536,7 +1536,7 @@ class Probe
                                                        $pubkey = substr($pubkey, 5);
                                                }
                                        } elseif (Strings::normaliseLink($pubkey) == 'http://') {
-                                               $curlResult = DI::httpRequest()->get($pubkey);
+                                               $curlResult = DI::httpClient()->get($pubkey);
                                                if ($curlResult->isTimeout()) {
                                                        self::$istimeout = true;
                                                        return $short ? false : [];
@@ -1570,7 +1570,7 @@ class Probe
                }
 
                // Fetch all additional data from the feed
-               $curlResult = DI::httpRequest()->get($data["poll"]);
+               $curlResult = DI::httpClient()->get($data["poll"]);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -1622,7 +1622,7 @@ class Probe
         */
        private static function pumpioProfileData($profile_link)
        {
-               $curlResult = DI::httpRequest()->get($profile_link);
+               $curlResult = DI::httpClient()->get($profile_link);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return [];
                }
@@ -1862,7 +1862,7 @@ class Probe
         */
        private static function feed($url, $probe = true)
        {
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
                if ($curlResult->isTimeout()) {
                        self::$istimeout = true;
                        return [];
@@ -2086,7 +2086,7 @@ class Probe
                        return '';
                }
 
-               $curlResult = DI::httpRequest()->get($gserver['noscrape'] . '/' . $data['nick']);
+               $curlResult = DI::httpClient()->get($gserver['noscrape'] . '/' . $data['nick']);
 
                if ($curlResult->isSuccess() && !empty($curlResult->getBody())) {
                        $noscrape = json_decode($curlResult->getBody(), true);
@@ -2161,7 +2161,7 @@ class Probe
        private static function updateFromFeed(array $data)
        {
                // Search for the newest entry in the feed
-               $curlResult = DI::httpRequest()->get($data['poll']);
+               $curlResult = DI::httpClient()->get($data['poll']);
                if (!$curlResult->isSuccess() || !$curlResult->getBody()) {
                        return '';
                }

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 141bce54270561107a4234b5a2102f7327baacc7..4ccd259f21c71655c6ff9e5ada0a3b538eae5565 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -976,7 +976,7 @@ class DFRN
 
                $content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
 
-               $postResult = DI::httpRequest()->post($dest_url, $envelope, ['Content-Type' => $content_type]);
+               $postResult = DI::httpClient()->post($dest_url, $envelope, ['Content-Type' => $content_type]);
                $xml = $postResult->getBody();
 
                $curl_stat = $postResult->getReturnCode();

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 32c0ce0428d9cfed6ad9913fbef29a2ecb3b27ab..48d7a3371cbfd49c62700b2da5fd30701f940213 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -1077,7 +1077,7 @@ class Diaspora
 
                Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
 
-               $envelope = DI::httpRequest()->fetch($source_url);
+               $envelope = DI::httpClient()->fetch($source_url);
                if ($envelope) {
                        Logger::log("Envelope was fetched.", Logger::DEBUG);
                        $x = self::verifyMagicEnvelope($envelope);
@@ -3022,7 +3022,7 @@ class Diaspora
                if (!intval(DI::config()->get("system", "diaspora_test"))) {
                        $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
 
-                       $postResult = DI::httpRequest()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
+                       $postResult = DI::httpClient()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
                        $return_code = $postResult->getReturnCode();
                } else {
                        Logger::log("test_mode");
@@ -3933,7 +3933,7 @@ class Diaspora
                        $dob = '';
 
                        if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
-                               list($year, $month, $day) = sscanf($profile['dob'], '%4d-%2d-%2d');
+                               [$year, $month, $day] = sscanf($profile['dob'], '%4d-%2d-%2d');
                                if ($year < 1004) {
                                        $year = 1004;
                                }

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 0801498f21f1cc5c166a92c216a9ca8a07945cdf..8ab7066ea99e4bfc7ca56e28c9bd143527e83872 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -297,7 +297,7 @@ class Feed
 
                        $orig_plink = $item["plink"];
 
-                       $item["plink"] = DI::httpRequest()->finalUrl($item["plink"]);
+                       $item["plink"] = DI::httpClient()->finalUrl($item["plink"]);
 
                        $item["title"] = XML::getFirstNodeValue($xpath, 'atom:title/text()', $entry);
 

diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index 367ebabc83148c65c83b8c48169f6c9072ec55d6..2404db2df92dcf93fdc9b1bdb9be4f52adaf3d51 100644 (file)
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -728,7 +728,7 @@ class OStatus
 
                self::$conv_list[$conversation] = true;
 
-               $curlResult = DI::httpRequest()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+               $curlResult = DI::httpClient()->get($conversation, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -758,7 +758,7 @@ class OStatus
                                        }
                                }
                                if ($file != '') {
-                                       $conversation_atom = DI::httpRequest()->get($attribute['href']);
+                                       $conversation_atom = DI::httpClient()->get($attribute['href']);
 
                                        if ($conversation_atom->isSuccess()) {
                                                $xml = $conversation_atom->getBody();
@@ -872,7 +872,7 @@ class OStatus
                        return;
                }
 
-               $curlResult = DI::httpRequest()->get($self);
+               $curlResult = DI::httpClient()->get($self);
 
                if (!$curlResult->isSuccess()) {
                        return;
@@ -922,7 +922,7 @@ class OStatus
                }
 
                $stored = false;
-               $curlResult = DI::httpRequest()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
+               $curlResult = DI::httpClient()->get($related, [HTTPClientOptions::ACCEPT_CONTENT => ['application/atom+xml', 'text/html']]);
 
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return;
@@ -954,7 +954,7 @@ class OStatus
                                        }
                                }
                                if ($atom_file != '') {
-                                       $curlResult = DI::httpRequest()->get($atom_file);
+                                       $curlResult = DI::httpClient()->get($atom_file);
 
                                        if ($curlResult->isSuccess()) {
                                                Logger::log('Fetched XML for URI ' . $related_uri, Logger::DEBUG);
@@ -966,7 +966,7 @@ class OStatus
 
                // Workaround for older GNU Social servers
                if (($xml == '') && strstr($related, '/notice/')) {
-                       $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
+                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related) . '.atom');
 
                        if ($curlResult->isSuccess()) {
                                Logger::log('GNU Social workaround to fetch XML for URI ' . $related_uri, Logger::DEBUG);
@@ -977,7 +977,7 @@ class OStatus
                // Even more worse workaround for GNU Social ;-)
                if ($xml == '') {
                        $related_guess = self::convertHref($related_uri);
-                       $curlResult = DI::httpRequest()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
+                       $curlResult = DI::httpClient()->get(str_replace('/notice/', '/api/statuses/show/', $related_guess) . '.atom');
 
                        if ($curlResult->isSuccess()) {
                                Logger::log('GNU Social workaround 2 to fetch XML for URI ' . $related_uri, Logger::DEBUG);

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 8d17f96783238c76242d0bd29d4194b9f627d35f..95bddcd6553b5d6c4e0efb7e428d5c6de086466d 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -72,7 +72,7 @@ class Salmon
                                                $ret[$x] = substr($ret[$x], 5);
                                        }
                                } elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
-                                       $ret[$x] = DI::httpRequest()->fetch($ret[$x]);
+                                       $ret[$x] = DI::httpClient()->fetch($ret[$x]);
                                }
                        }
                }
@@ -155,7 +155,7 @@ class Salmon
                $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                // slap them
-               $postResult = DI::httpRequest()->post($url, $salmon, [
+               $postResult = DI::httpClient()->post($url, $salmon, [
                        'Content-type' => 'application/magic-envelope+xml',
                        'Content-length' => strlen($salmon),
                ]);
@@ -180,7 +180,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon),
                        ]);
@@ -203,7 +203,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = DI::httpRequest()->post($url, $salmon, [
+                       $postResult = DI::httpClient()->post($url, $salmon, [
                                'Content-type' => 'application/magic-envelope+xml',
                                'Content-length' => strlen($salmon)]);
                        $return_code = $postResult->getReturnCode();

diff --git a/src/Security/ExAuth.php b/src/Security/ExAuth.php
index 87f236d4eccce922da7c05fc9abea83123572fc8..fd71dea71a85e91609fc4459bb10504c48fb840b 100644 (file)
--- a/src/Security/ExAuth.php
+++ b/src/Security/ExAuth.php
@@ -222,7 +222,7 @@ class ExAuth
 
                $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-               $curlResult = DI::httpRequest()->get($url);
+               $curlResult = DI::httpClient()->get($url);
 
                if (!$curlResult->isSuccess()) {
                        return false;

diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index d96b6791174ea64ded05f955adbf1caa51069828..89cb0452a3c2a1b0a8b93c798587e1d19e71c0e9 100644 (file)
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -305,7 +305,7 @@ class HTTPSignature
 
                $headers['Content-Type'] = 'application/activity+json';
 
-               $postResult = DI::httpRequest()->post($target, $content, $headers);
+               $postResult = DI::httpClient()->post($target, $content, $headers);
                $return_code = $postResult->getReturnCode();
 
                Logger::log('Transmit to ' . $target . ' returned ' . $return_code, Logger::DEBUG);
@@ -453,9 +453,9 @@ class HTTPSignature
                $curl_opts[HTTPClientOptions::HEADERS] = $header;
 
                if (!empty($opts['nobody'])) {
-                       $curlResult = DI::httpRequest()->head($request, $curl_opts);
+                       $curlResult = DI::httpClient()->head($request, $curl_opts);
                } else {
-                       $curlResult = DI::httpRequest()->get($request, $curl_opts);
+                       $curlResult = DI::httpClient()->get($request, $curl_opts);
                }
                $return_code = $curlResult->getReturnCode();
 

diff --git a/src/Util/Images.php b/src/Util/Images.php
index bf84ee6c22552bad74d3db1eb83272a5bc52f0d3..8a810510f0489916363b98e1d397e430b602a9e0 100644 (file)
--- a/src/Util/Images.php
+++ b/src/Util/Images.php
@@ -193,7 +193,7 @@ class Images
                }
 
                if (empty($img_str)) {
-                       $img_str = DI::httpRequest()->fetch($url, 4);
+                       $img_str = DI::httpClient()->fetch($url, 4);
                }
 
                if (!$img_str) {

diff --git a/src/Util/ParseUrl.php b/src/Util/ParseUrl.php
index 3b341bddbb78ba01be4cfeff6b8d7918ff46449d..391b96767ee3df0ca0f7750c952883d0d7313f62 100644 (file)
--- a/src/Util/ParseUrl.php
+++ b/src/Util/ParseUrl.php
@@ -59,7 +59,7 @@ class ParseUrl
         */
        public static function getContentType(string $url)
        {
-               $curlResult = DI::httpRequest()->head($url);
+               $curlResult = DI::httpClient()->head($url);
                if (!$curlResult->isSuccess()) {
                        return [];
                }
@@ -214,7 +214,7 @@ class ParseUrl
                        return $siteinfo;
                }
 
-               $curlResult = DI::httpRequest()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
+               $curlResult = DI::httpClient()->get($url, [HTTPClientOptions::CONTENT_LENGTH => 1000000]);
                if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
                        return $siteinfo;
                }

diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index e5888c5c762f4ec123ab44a522a8f095a2774ed8..6f764a72dbd959c122b58c5927c4843de7e0ae71 100644 (file)
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -54,7 +54,7 @@ class CheckVersion
                Logger::log("Checking VERSION from: ".$checked_url, Logger::DEBUG);
 
                // fetch the VERSION file
-               $gitversion = DBA::escape(trim(DI::httpRequest()->fetch($checked_url)));
+               $gitversion = DBA::escape(trim(DI::httpClient()->fetch($checked_url)));
                Logger::log("Upstream VERSION is: ".$gitversion, Logger::DEBUG);
 
                DI::config()->set('system', 'git_friendica_version', $gitversion);

diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index 12dfda087368864b37cfb4576d0daf33fb33b9d3..3dcaa7205bf3cca6e6ed6add49baa5379bd53c8c 100644 (file)
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -53,7 +53,7 @@ class Directory
 
                Logger::log('Updating directory: ' . $arr['url'], Logger::DEBUG);
                if (strlen($arr['url'])) {
-                       DI::httpRequest()->fetch($dir . '?url=' . bin2hex($arr['url']));
+                       DI::httpClient()->fetch($dir . '?url=' . bin2hex($arr['url']));
                }
 
                return;

diff --git a/src/Worker/NodeInfo.php b/src/Worker/NodeInfo.php
index 5598eabb7297eb90426327a1233b3d3c0cbab98c..d1f1abbd80992ee9ccb5da9fc77473329b3ed316 100644 (file)
--- a/src/Worker/NodeInfo.php
+++ b/src/Worker/NodeInfo.php
@@ -34,7 +34,7 @@ class NodeInfo
                // Now trying to register
                $url = 'http://the-federation.info/register/' . DI::baseUrl()->getHostname();
                Logger::debug('Check registering url', ['url' => $url]);
-               $ret = DI::httpRequest()->fetch($url);
+               $ret = DI::httpClient()->fetch($url);
                Logger::debug('Check registering answer', ['answer' => $ret]);
                Logger::info('end');
        }

diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 9e99edafa65144f8c48a98e40cec1f9485aa39a2..e1f0f61080d34db537e5599ade444b37287c470f 100644 (file)
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -153,7 +153,7 @@ class OnePoll
                }
 
                $cookiejar = tempnam(get_temppath(), 'cookiejar-onepoll-');
-               $curlResult = DI::httpRequest()->get($contact['poll'], [HTTPClientOptions::COOKIEJAR => $cookiejar]);
+               $curlResult = DI::httpClient()->get($contact['poll'], [HTTPClientOptions::COOKIEJAR => $cookiejar]);
                unlink($cookiejar);
 
                if ($curlResult->isTimeout()) {
@@ -459,7 +459,7 @@ class OnePoll
                        DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
                }
 
-               $postResult = DI::httpRequest()->post($url, $params);
+               $postResult = DI::httpClient()->post($url, $params);
 
                Logger::info('Hub subscription done', ['result' => $postResult->getReturnCode()]);
 

diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index a3e2ee4ad09130d8961ac68e114374e998d09192..f9c311b2d9f5243842612e9fea2521d5d8c92adc 100644 (file)
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -68,7 +68,7 @@ class PubSubPublish
 
                Logger::log('POST ' . print_r($headers, true) . "\n" . $params, Logger::DATA);
 
-               $postResult = DI::httpRequest()->post($subscriber['callback_url'], $params, $headers);
+               $postResult = DI::httpClient()->post($subscriber['callback_url'], $params, $headers);
                $ret = $postResult->getReturnCode();
 
                if ($ret >= 200 && $ret <= 299) {

diff --git a/src/Worker/PullDirectory.php b/src/Worker/PullDirectory.php
index d9a559bf5f260255f5a68958a9640baba242ea85..86c8f5a25a8293de66b090c2da0d08174a702734 100644 (file)
--- a/src/Worker/PullDirectory.php
+++ b/src/Worker/PullDirectory.php
@@ -47,7 +47,7 @@ class PullDirectory
 
                Logger::info('Synchronization started.', ['now' => $now, 'directory' => $directory]);
 
-               $result = DI::httpRequest()->fetch($directory . '/sync/pull/since/' . $now);
+               $result = DI::httpClient()->fetch($directory . '/sync/pull/since/' . $now);
                if (empty($result)) {
                        Logger::info('Directory server return empty result.', ['directory' => $directory]);
                        return;

diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 6dd7f79e1585af856637713b37a3d20b6e483855..bb69969b9e644a7f257f0ee9766a0ca48af530bd 100644 (file)
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -46,7 +46,7 @@ class SearchDirectory
                        }
                }
 
-               $x = DI::httpRequest()->fetch(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
+               $x = DI::httpClient()->fetch(Search::getGlobalDirectory() . '/lsearch?p=1&n=500&search=' . urlencode($search));
                $j = json_decode($x);
 
                if (!empty($j->results)) {

diff --git a/src/Worker/UpdateServerDirectory.php b/src/Worker/UpdateServerDirectory.php
index 62f171fb5a6249da553aa1dfe3fe9cf1b57e0813..6b908b6f93b7249e43b99f95f843e8a68fb89403 100644 (file)
--- a/src/Worker/UpdateServerDirectory.php
+++ b/src/Worker/UpdateServerDirectory.php
@@ -45,7 +45,7 @@ class UpdateServerDirectory
 
        private static function discoverPoCo(array $gserver)
        {
-               $result = DI::httpRequest()->fetch($gserver['poco'] . '?fields=urls');
+               $result = DI::httpClient()->fetch($gserver['poco'] . '?fields=urls');
                if (empty($result)) {
                        Logger::info('Empty result', ['url' => $gserver['url']]);
                        return;
@@ -78,7 +78,7 @@ class UpdateServerDirectory
 
        private static function discoverMastodonDirectory(array $gserver)
        {               
-               $result = DI::httpRequest()->fetch($gserver['url'] . '/api/v1/directory?order=new&local=true&limit=200&offset=0');
+               $result = DI::httpClient()->fetch($gserver['url'] . '/api/v1/directory?order=new&local=true&limit=200&offset=0');
                if (empty($result)) {
                        Logger::info('Empty result', ['url' => $gserver['url']]);
                        return;

diff --git a/src/Worker/UpdateServerPeers.php b/src/Worker/UpdateServerPeers.php
index 4569539d61fa48779059c50d469c7432afa6add8..e058506b8636359ef08af691145b09ca08f69809 100644 (file)
--- a/src/Worker/UpdateServerPeers.php
+++ b/src/Worker/UpdateServerPeers.php
@@ -35,7 +35,7 @@ class UpdateServerPeers
         */
        public static function execute(string $url)
        {
-               $ret = DI::httpRequest()->get($url . '/api/v1/instance/peers');
+               $ret = DI::httpClient()->get($url . '/api/v1/instance/peers');
                if (!$ret->isSuccess() || empty($ret->getBody())) {
                        Logger::info('Server is not reachable or does not offer the "peers" endpoint', ['url' => $url]);
                        return;