Fix probable bugs; Clean up style

This commit is contained in:
Zach Borboa
2016-12-28 19:19:23 -08:00
parent 9eef25aa4f
commit 79f659d159
2 changed files with 7 additions and 12 deletions
+4 -2
View File
@@ -2,6 +2,8 @@
namespace Curl;
use Curl\ArrayUtil;
class Curl
{
const VERSION = '7.1.0';
@@ -148,8 +150,8 @@ class Curl
// Manually build a single-dimensional array from a multi-dimensional array as using curl_setopt($ch,
// CURLOPT_POSTFIELDS, $data) doesn't correctly handle multi-dimensional arrays when files are
// referenced.
if (\Curl\ArrayUtil::is_array_multidim($data)) {
$data = \Curl\ArrayUtil::array_flatten_multidim($data);
if (ArrayUtil::is_array_multidim($data)) {
$data = ArrayUtil::array_flatten_multidim($data);
}
// Modify array values to ensure any referenced files are properly handled depending on the support of
+3 -10
View File
@@ -453,12 +453,10 @@ class MultiCurl
*
* @access public
* @param $string
*
* @return bool
*/
public function setCookieString($string)
{
return $this->setOpt(CURLOPT_COOKIE, $string);
$this->setOpt(CURLOPT_COOKIE, $string);
}
/**
@@ -466,12 +464,10 @@ class MultiCurl
*
* @access public
* @param $cookie_file
*
* @return boolean
*/
public function setCookieFile($cookie_file)
{
return $this->setOpt(CURLOPT_COOKIEFILE, $cookie_file);
$this->setOpt(CURLOPT_COOKIEFILE, $cookie_file);
}
/**
@@ -479,12 +475,10 @@ class MultiCurl
*
* @access public
* @param $cookie_jar
*
* @return boolean
*/
public function setCookieJar($cookie_jar)
{
return $this->setOpt(CURLOPT_COOKIEJAR, $cookie_jar);
$this->setOpt(CURLOPT_COOKIEJAR, $cookie_jar);
}
/**
@@ -798,7 +792,6 @@ class MultiCurl
}
$this->activeCurls[$curl->id] = $curl;
$this->responseCookies = array();
$curl->call($curl->beforeSendFunction);
}
}