geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-10-10 05:55:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow the disabling of automatic response decoding.

Browse Source 
The following will disable their respective decoders:

  $curl->setDefaultDecoder(false);
  $curl->setJsonDecoder(false);
  $curl->setXmlDecoder(false);
This commit is contained in:
Zach Borboa
2017-04-29 02:54:35 -07:00
parent 5706ad7723
commit efbcc080bb
6 changed files with 209 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+27 -23
View File
@@ -905,16 +905,18 @@ class Curl
* Set Default Decoder
*
* @access public
* @param $decoder string|callable
* @param $mixed boolean|callable|string
*/
public function setDefaultDecoder($decoder = 'json')
public function setDefaultDecoder($mixed = 'json')
{
if (is_callable($decoder)) {
$this->defaultDecoder = $decoder;
if ($mixed === false) {
$this->defaultDecoder = false;
} elseif (is_callable($mixed)) {
$this->defaultDecoder = $mixed;
} else {
if ($decoder === 'json') {
if ($mixed === 'json') {
$this->defaultDecoder = $this->jsonDecoder;
} elseif ($decoder === 'xml') {
} elseif ($mixed === 'xml') {
$this->defaultDecoder = $this->xmlDecoder;
}
}
@@ -988,13 +990,16 @@ class Curl
* Set JSON Decoder
*
* @access public
* @param $function
* @param $mixed boolean|callable
*/
public function setJsonDecoder($function)
public function setJsonDecoder($mixed)
{
if (is_callable($function)) {
$this->jsonDecoder = $function;
$this->jsonDecoderArgs = func_get_args();
if ($mixed === false) {
$this->jsonDecoder = false;
$this->jsonDecoderArgs = array();
} elseif (is_callable($mixed)) {
$this->jsonDecoder = $mixed;
$this->jsonDecoderArgs = array();
}
}
@@ -1002,12 +1007,14 @@ class Curl
* Set XML Decoder
*
* @access public
* @param $function
* @param $mixed boolean|callable
*/
public function setXmlDecoder($function)
public function setXmlDecoder($mixed)
{
if (is_callable($function)) {
$this->xmlDecoder = $function;
if ($mixed === false) {
$this->xmlDecoder = false;
} elseif (is_callable($mixed)) {
$this->xmlDecoder = $mixed;
}
}
@@ -1322,21 +1329,18 @@ class Curl
$response = $raw_response;
if (isset($response_headers['Content-Type'])) {
if (preg_match($this->jsonPattern, $response_headers['Content-Type'])) {
$json_decoder = $this->jsonDecoder;
if ($this->jsonDecoder) {
$args = $this->jsonDecoderArgs;
array_unshift($args, $response);
$response = call_user_func_array($json_decoder, $args);
$response = call_user_func_array($this->jsonDecoder, $args);
}
} elseif (preg_match($this->xmlPattern, $response_headers['Content-Type'])) {
$xml_decoder = $this->xmlDecoder;
if ($xml_decoder) {
$response = call_user_func($xml_decoder, $response);
if ($this->xmlDecoder) {
$response = call_user_func($this->xmlDecoder, $response);
}
} else {
$default_decoder = $this->defaultDecoder;
if ($default_decoder) {
$response = call_user_func($default_decoder, $response);
if ($this->defaultDecoder) {
$response = call_user_func($this->defaultDecoder, $response);
}
}
}
src/Curl/MultiCurl.php
+12 -8
View File
@@ -514,12 +514,14 @@ class MultiCurl
* Set JSON Decoder
*
* @access public
* @param $function
* @param $mixed boolean|callable
*/
public function setJsonDecoder($function)
public function setJsonDecoder($mixed)
{
if (is_callable($function)) {
$this->jsonDecoder = $function;
if ($mixed === false) {
$this->jsonDecoder = false;
} elseif (is_callable($mixed)) {
$this->jsonDecoder = $mixed;
}
}
@@ -527,12 +529,14 @@ class MultiCurl
* Set XML Decoder
*
* @access public
* @param $function
* @param $mixed boolean|callable
*/
public function setXmlDecoder($function)
public function setXmlDecoder($mixed)
{
if (is_callable($function)) {
$this->xmlDecoder = $function;
if ($mixed === false) {
$this->xmlDecoder = false;
} elseif (is_callable($mixed)) {
$this->xmlDecoder = $mixed;
}
}