geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-13 11:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove use of anonymous functions for json decoder and xml decoder

Browse Source
This commit is contained in:
Zach Borboa
2017-04-27 02:41:45 -07:00
parent ee6908aef9
commit a6e94ae8bd
1 changed files with 55 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+55 -34
View File
@@ -4,6 +4,45 @@ namespace Curl;
use Curl\ArrayUtil;
/**
* Decode JSON
*
* @param $json
* @param $assoc
* @param $depth
* @param $options
*/
function decodeJson() {
$args = func_get_args();
// Call json_decode() without the $options parameter in PHP
// versions less than 5.4.0 as the $options parameter was added in
// PHP version 5.4.0.
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
$args = array_slice($args, 0, 3);
}
$response = call_user_func_array('json_decode', $args);
if ($response === null) {
$response = $args['0'];
}
return $response;
}
/**
* Decode XML
*
* @param $response
*/
function decodeXml($response) {
$xml_obj = @simplexml_load_string($response);
if (!($xml_obj === false)) {
$response = $xml_obj;
}
return $response;
}
class Curl
{
const VERSION = '7.2.0';
@@ -44,9 +83,10 @@ class Curl
private $headers = array();
private $options = array();
private $jsonDecoder = null;
private $jsonDecoder = '\Curl\decodeJson';
private $jsonDecoderArgs = array();
private $jsonPattern = '/^(?:application|text)\/(?:[a-z]+(?:[\.-][0-9a-z]+){0,}[\+\.]|x-)?json(?:-[a-z]+)?/i';
private $xmlDecoder = null;
private $xmlDecoder = '\Curl\decodeXml';
private $xmlPattern = '~^(?:text/|application/(?:atom\+|rss\+)?)xml~i';
private $defaultDecoder = null;
@@ -106,8 +146,6 @@ class Curl
$this->curl = curl_init();
$this->id = uniqid('', true);
$this->setDefaultUserAgent();
$this->setDefaultJsonDecoder();
$this->setDefaultXmlDecoder();
$this->setDefaultTimeout();
$this->setOpt(CURLINFO_HEADER_OUT, true);
$this->setOpt(CURLOPT_HEADERFUNCTION, array($this, 'headerCallback'));
@@ -205,6 +243,7 @@ class Curl
}
$this->options = null;
$this->jsonDecoder = null;
$this->jsonDecoderArgs = null;
$this->xmlDecoder = null;
$this->defaultDecoder = null;
}
@@ -886,23 +925,8 @@ class Curl
*/
public function setDefaultJsonDecoder()
{
$args = func_get_args();
$this->jsonDecoder = function ($response) use ($args) {
array_unshift($args, $response);
// Call json_decode() without the $options parameter in PHP
// versions less than 5.4.0 as the $options parameter was added in
// PHP version 5.4.0.
if (version_compare(PHP_VERSION, '5.4.0', '<')) {
$args = array_slice($args, 0, 3);
}
$json_obj = call_user_func_array('json_decode', $args);
if (!($json_obj === null)) {
$response = $json_obj;
}
return $response;
};
$this->jsonDecoder = '\Curl\decodeJson';
$this->jsonDecoderArgs = func_get_args();
}
/**
@@ -912,13 +936,7 @@ class Curl
*/
public function setDefaultXmlDecoder()
{
$this->xmlDecoder = function ($response) {
$xml_obj = @simplexml_load_string($response);
if (!($xml_obj === false)) {
$response = $xml_obj;
}
return $response;
};
$this->xmlDecoder = '\Curl\decodeXml';
}
/**
@@ -1014,6 +1032,7 @@ class Curl
{
if (is_callable($function)) {
$this->jsonDecoder = $function;
$this->jsonDecoderArgs = func_get_args();
}
}
@@ -1342,18 +1361,20 @@ class Curl
if (isset($response_headers['Content-Type'])) {
if (preg_match($this->jsonPattern, $response_headers['Content-Type'])) {
$json_decoder = $this->jsonDecoder;
if (is_callable($json_decoder)) {
$response = $json_decoder($response);
if ($this->jsonDecoder) {
$args = $this->jsonDecoderArgs;
array_unshift($args, $response);
$response = call_user_func_array($json_decoder, $args);
}
} elseif (preg_match($this->xmlPattern, $response_headers['Content-Type'])) {
$xml_decoder = $this->xmlDecoder;
if (is_callable($xml_decoder)) {
if ($xml_decoder) {
$response = $xml_decoder($response);
}
} else {
$decoder = $this->defaultDecoder;
if (is_callable($decoder)) {
$response = $decoder($response);
$default_decoder = $this->defaultDecoder;
if ($default_decoder) {
$response = $default_decoder($response);
}
}
}