geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-08-30 12:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-php-curl-class:php-curl-class/php-curl-class

Browse Source 
* 'master' of github.com-php-curl-class:php-curl-class/php-curl-class:
  Fix indentation
  Clarify documented return values; Remove parseResponse() unnecessarily returning array
This commit is contained in:
Zach Borboa
2016-07-04 02:30:12 -07:00
parent 4ed57ee8f2 b91dd877c6
commit 2dca55fe5d
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+7 -4
View File
@@ -333,7 +333,7 @@ class Curl
* @access public
* @param $ch
*
* @return string
* @return mixed Returns the value provided by parseResponse.
*/
public function exec($ch = null)
{
@@ -360,7 +360,7 @@ class Curl
$this->requestHeaders = $this->parseRequestHeaders(curl_getinfo($this->curl, CURLINFO_HEADER_OUT));
}
$this->responseHeaders = $this->parseResponseHeaders($this->rawResponseHeaders);
list($this->response, $this->rawResponse) = $this->parseResponse($this->responseHeaders, $this->rawResponse);
$this->response = $this->parseResponse($this->responseHeaders, $this->rawResponse);
$this->httpErrorMessage = '';
if ($this->error) {
@@ -1022,7 +1022,10 @@ class Curl
* @param $response_headers
* @param $raw_response
*
* @return array
* @return mixed
* Provided the content-type is determined to be json or xml:
* Returns stdClass object when the default json decoder is used and the content-type is json.
* Returns SimpleXMLElement object when the default xml decoder is used and the content-type is xml.
*/
private function parseResponse($response_headers, $raw_response)
{
@@ -1041,7 +1044,7 @@ class Curl
}
}
return array($response, $raw_response);
return $response;
}
/**