X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCxn%2FCiviCxnHttp.php;h=17aa4fb549c83f47b9df08c2c440bbd54e781cbd;hb=577dec46a547a6247840caf3602aa65fd2b77d1c;hp=0d6024812cc0c40441ab0acd4a49dd157eedf06c;hpb=da1ad7aad9f3b6496444899dabcaa03e223224e3;p=civicrm-core.git

diff --git a/CRM/Cxn/CiviCxnHttp.php b/CRM/Cxn/CiviCxnHttp.php
index 0d6024812c..17aa4fb549 100644
--- a/CRM/Cxn/CiviCxnHttp.php
+++ b/CRM/Cxn/CiviCxnHttp.php
@@ -17,16 +17,20 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
   protected $cache;
 
   /**
+   * Singleton object.
+   *
    * @param bool $fresh
+   *
    * @return CRM_Cxn_CiviCxnHttp
+   * @throws \CRM_Core_Exception
    */
   public static function singleton($fresh = FALSE) {
     if (self::$singleton === NULL || $fresh) {
-      $cache = CRM_Utils_Cache::create(array(
+      $cache = CRM_Utils_Cache::create([
         'name' => 'CiviCxnHttp',
-        'type' => Civi::settings()->get('debug_enabled') ? 'ArrayCache' : array('SqlGroup', 'ArrayCache'),
+        'type' => Civi::settings()->get('debug_enabled') ? 'ArrayCache' : ['SqlGroup', 'ArrayCache'],
         'prefetch' => FALSE,
-      ));
+      ]);
 
       self::$singleton = new CRM_Cxn_CiviCxnHttp($cache);
     }
@@ -34,14 +38,17 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
   }
 
   /**
-   * @param CRM_Utils_Cache_Interface|NULL $cache
-   *   The cache data store.
+   * The cache data store.
+   *
+   * @param CRM_Utils_Cache_Interface|null $cache
    */
   public function __construct($cache) {
     $this->cache = $cache;
   }
 
   /**
+   * Send.
+   *
    * @param string $verb
    * @param string $url
    * @param string $blob
@@ -50,7 +57,7 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
    * @return array
    *   array($headers, $blob, $code)
    */
-  public function send($verb, $url, $blob, $headers = array()) {
+  public function send($verb, $url, $blob, $headers = []) {
     $lowVerb = strtolower($verb);
 
     if ($lowVerb === 'get' && $this->cache) {
@@ -67,11 +74,11 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
       $expires = CRM_Utils_Http::parseExpiration($result[0]);
       if ($expires !== NULL) {
         $cachePath = 'get_' . md5($url);
-        $cacheLine = array(
+        $cacheLine = [
           'url' => $url,
           'expires' => $expires,
           'data' => $result,
-        );
+        ];
         $this->cache->set($cachePath, $cacheLine);
       }
     }
@@ -93,20 +100,22 @@ class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
   protected function createStreamOpts($verb, $url, $blob, $headers) {
     $result = parent::createStreamOpts($verb, $url, $blob, $headers);
 
-    $caConfig = CA_Config_Stream::probe(array(
+    $caConfig = CA_Config_Stream::probe([
       'verify_peer' => (bool) Civi::settings()->get('verifySSL'),
-    ));
+    ]);
     if ($caConfig->isEnableSSL()) {
       $result['ssl'] = $caConfig->toStreamOptions();
     }
     if (!$caConfig->isEnableSSL() && preg_match('/^https:/', $url)) {
-      CRM_Core_Error::fatal('Cannot fetch document - system does not support SSL');
+      throw new CRM_Core_Exception('Cannot fetch document - system does not support SSL');
     }
 
     return $result;
   }
 
   /**
+   * Get cache.
+   *
    * @return \CRM_Utils_Cache_Interface|null
    */
   public function getCache() {