From bfebb82adb3592c015489d4e0e3e8a0aac47a5f4 Mon Sep 17 00:00:00 2001 From: Zach Borboa Date: Mon, 4 Jul 2016 01:53:35 -0700 Subject: [PATCH] Clarify documented return values; Remove parseResponse() unnecessarily returning array --- src/Curl/Curl.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Curl/Curl.php b/src/Curl/Curl.php index 59e0034..6e65d52 100644 --- a/src/Curl/Curl.php +++ b/src/Curl/Curl.php @@ -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; } /**