CA_Config - Move from packages.git to composer.json

diff --git a/CRM/Utils/HttpClient.php b/CRM/Utils/HttpClient.php
index 29b27a9ea77b154dc2260c5c26259d2bc5e702db..48db39999a32f6e38965cb1b91660e67e784724e 100644 (file)
--- a/CRM/Utils/HttpClient.php
+++ b/CRM/Utils/HttpClient.php
@@ -196,7 +196,6 @@ class CRM_Utils_HttpClient {
    *   (0 => resource, 1 => CA_Config_Curl)
    */
   protected function createCurl($remoteFile) {
-    require_once 'CA/Config/Curl.php';
     $caConfig = CA_Config_Curl::probe(array(
       'verify_peer' => (bool) CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'verifySSL', NULL, TRUE),
     ));

diff --git a/composer.json b/composer.json
index 4ee79b3b94f0843bb1cfbf9876169eb4c457bb90..89325b984377880865c4c957bd27b52de6477940 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
     "symfony/dependency-injection": "2.3.*",
     "symfony/event-dispatcher": "2.3.*",
     "psr/log": "1.0.0",
-    "symfony/finder": "2.3.*"
+    "symfony/finder": "2.3.*",
+    "totten/ca-config": "~13.02"
   }
 }