From: Matthew Wire <mjw@mjwconsult.co.uk>
Date: Wed, 11 Aug 2021 16:19:37 +0000 (+0100)
Subject: Switch extension browser getRemoteJSON to use guzzle
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c4ba4203cb774871cd929bb71c26437a6dcc1055;p=civicrm-core.git

Switch extension browser getRemoteJSON to use guzzle
---

diff --git a/CRM/Extension/Browser.php b/CRM/Extension/Browser.php
index 62d1b25bf9..b808ce4b2c 100644
--- a/CRM/Extension/Browser.php
+++ b/CRM/Extension/Browser.php
@@ -219,31 +219,23 @@ class CRM_Extension_Browser {
    * @throws \CRM_Extension_Exception
    */
   private function grabRemoteJson() {
-
-    ini_set('default_socket_timeout', self::CHECK_TIMEOUT);
     set_error_handler(array('CRM_Extension_Browser', 'downloadError'));
 
-    if (!ini_get('allow_url_fopen')) {
-      ini_set('allow_url_fopen', 1);
-    }
-
     if (FALSE === $this->getRepositoryUrl()) {
       // don't check if the user has configured civi not to check an external
       // url for extensions. See CRM-10575.
-      return [];
+      return '';
     }
 
     $filename = $this->cacheDir . DIRECTORY_SEPARATOR . self::CACHE_JSON_FILE . '.' . md5($this->getRepositoryUrl());
     $url = $this->getRepositoryUrl() . $this->indexPath;
-    $status = CRM_Utils_HttpClient::singleton()->fetch($url, $filename);
-
-    ini_restore('allow_url_fopen');
-    ini_restore('default_socket_timeout');
 
+    $client = new GuzzleHttp\Client();
+    $response = $client->request('GET', $url, ['sink' => $filename, 'timeout' => \Civi::settings()->get('http_timeout')]);
     restore_error_handler();
 
-    if ($status !== CRM_Utils_HttpClient::STATUS_OK) {
-      throw new CRM_Extension_Exception(ts('The CiviCRM public extensions directory at %1 could not be contacted - please check your webserver can make external HTTP requests. Contact your site administrator for assistance.', [1 => $this->getRepositoryUrl()]), 'connection_error');
+    if ($response->getStatusCode() !== 200) {
+      throw new CRM_Extension_Exception(ts('The CiviCRM public extensions directory at %1 could not be contacted - please check your webserver can make external HTTP requests', [1 => $this->getRepositoryUrl()]), 'connection_error');
     }
 
     // Don't call grabCachedJson here, that would risk infinite recursion