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

Fix #64: Allow access to raw response content

Browse Source
This commit is contained in:
Zach Borboa
2014-06-12 09:30:08 -07:00
parent eefd6593fa
commit 85e4109f6a
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+7 -4
View File
@@ -35,6 +35,7 @@ class Curl
public $request_headers = null;
public $response_headers = null;
public $response = null;
public $raw_response = null;
public function __construct()
{
@@ -311,6 +312,7 @@ class Curl
private function parseResponse($response)
{
$response_headers = '';
$raw_response = $response;
if (!(strpos($response, "\r\n\r\n") === false)) {
$response_array = explode("\r\n\r\n", $response);
for ($i = count($response_array) - 1; $i >= 0; $i--) {
@@ -325,6 +327,7 @@ class Curl
list($response_header, $response) = explode("\r\n\r\n", $response, 2);
}
$response_headers = $this->parseResponseHeaders($response_header);
$raw_response = $response;
if (isset($response_headers['Content-Type'])) {
if (preg_match('/^application\/json/i', $response_headers['Content-Type'])) {
@@ -344,7 +347,7 @@ class Curl
}
}
return array($response_headers, $response);
return array($response_headers, $response, $raw_response);
}
private function parseResponseHeaders($raw_headers)
@@ -398,9 +401,9 @@ class Curl
$ch = is_null($_ch) ? $this : $_ch;
if ($ch->multi_child) {
$ch->response = curl_multi_getcontent($ch->curl);
$ch->raw_response = curl_multi_getcontent($ch->curl);
} else {
$ch->response = curl_exec($ch->curl);
$ch->raw_response = curl_exec($ch->curl);
$ch->curl_error_code = curl_errno($ch->curl);
}
@@ -412,7 +415,7 @@ class Curl
$ch->error_code = $ch->error ? ($ch->curl_error ? $ch->curl_error_code : $ch->http_status_code) : 0;
$ch->request_headers = $this->parseRequestHeaders(curl_getinfo($ch->curl, CURLINFO_HEADER_OUT));
list($ch->response_headers, $ch->response) = $this->parseResponse($ch->response);
list($ch->response_headers, $ch->response, $ch->raw_response) = $this->parseResponse($ch->raw_response);
$ch->http_error_message = '';
if ($ch->error) {
tests/PHPCurlClass/PHPCurlClassTest.php
+27
View File
@@ -541,6 +541,15 @@ class CurlTest extends PHPUnit_Framework_TestCase
PHPUnit_Framework_Assert::assertTrue(is_float($response->float));
PHPUnit_Framework_Assert::assertEmpty($response->empty);
PHPUnit_Framework_Assert::assertTrue(is_string($response->string));
PHPUnit_Framework_Assert::assertEquals($test->curl->raw_response, json_encode(array(
'null' => null,
'true' => true,
'false' => false,
'integer' => 1,
'float' => 3.14,
'empty' => '',
'string' => 'string',
)));
}
assertion('Content-Type', 'APPLICATION/JSON');
@@ -576,6 +585,24 @@ class CurlTest extends PHPUnit_Framework_TestCase
));
PHPUnit_Framework_Assert::assertInstanceOf('SimpleXMLElement', $test->curl->response);
$doc = new DOMDocument();
$doc->formatOutput = true;
$rss = $doc->appendChild($doc->createElement('rss'));
$rss->setAttribute('version', '2.0');
$channel = $doc->createElement('channel');
$title = $doc->createElement('title');
$title->appendChild($doc->createTextNode('Title'));
$channel->appendChild($title);
$link = $doc->createElement('link');
$link->appendChild($doc->createTextNode('Link'));
$channel->appendChild($link);
$description = $doc->createElement('description');
$description->appendChild($doc->createTextNode('Description'));
$channel->appendChild($description);
$rss->appendChild($channel);
$xml = $doc->saveXML();
PHPUnit_Framework_Assert::assertEquals($test->curl->raw_response, $xml);
}
xmlAssertion('Content-Type', 'application/atom+xml; charset=UTF-8');