projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17715 from civicrm/5.27
[civicrm-core.git]
/
CRM
/
Cxn
/
CiviCxnHttp.php
diff --git
a/CRM/Cxn/CiviCxnHttp.php
b/CRM/Cxn/CiviCxnHttp.php
index f8acdb9704322a09d78b7654508c1ce11f93732e..17aa4fb549c83f47b9df08c2c440bbd54e781cbd 100644
(file)
--- a/
CRM/Cxn/CiviCxnHttp.php
+++ b/
CRM/Cxn/CiviCxnHttp.php
@@
-17,8
+17,12
@@
class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
protected $cache;
/**
protected $cache;
/**
+ * Singleton object.
+ *
* @param bool $fresh
* @param bool $fresh
+ *
* @return CRM_Cxn_CiviCxnHttp
* @return CRM_Cxn_CiviCxnHttp
+ * @throws \CRM_Core_Exception
*/
public static function singleton($fresh = FALSE) {
if (self::$singleton === NULL || $fresh) {
*/
public static function singleton($fresh = FALSE) {
if (self::$singleton === NULL || $fresh) {
@@
-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;
}
/**
*/
public function __construct($cache) {
$this->cache = $cache;
}
/**
+ * Send.
+ *
* @param string $verb
* @param string $url
* @param string $blob
* @param string $verb
* @param string $url
* @param string $blob
@@
-100,13
+107,15
@@
class CRM_Cxn_CiviCxnHttp extends \Civi\Cxn\Rpc\Http\PhpHttp {
$result['ssl'] = $caConfig->toStreamOptions();
}
if (!$caConfig->isEnableSSL() && preg_match('/^https:/', $url)) {
$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;
}
/**
}
return $result;
}
/**
+ * Get cache.
+ *
* @return \CRM_Utils_Cache_Interface|null
*/
public function getCache() {
* @return \CRM_Utils_Cache_Interface|null
*/
public function getCache() {