Skip to content

Added reset method. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2014
Merged

Added reset method. #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 28 additions & 5 deletions src/Curl/Curl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ public function __construct() {
throw new \ErrorException('cURL library is not loaded');
}

$this->curl = curl_init();
$this->setUserAgent(self::USER_AGENT);
$this->setopt(CURLINFO_HEADER_OUT, TRUE);
$this->setopt(CURLOPT_HEADER, TRUE);
$this->setopt(CURLOPT_RETURNTRANSFER, TRUE);
$this->init();
}

public function get($url, $data = array()) {
Expand Down Expand Up @@ -125,6 +121,25 @@ public function close() {
curl_close($this->curl);
}
}

public function reset() {
$this->close();
$this->_cookies = array();
$this->_headers = array();
$this->error = FALSE;
$this->error_code = 0;
$this->error_message = NULL;
$this->curl_error = FALSE;
$this->curl_error_code = 0;
$this->curl_error_message = NULL;
$this->http_error = FALSE;
$this->http_status_code = 0;
$this->http_error_message = NULL;
$this->request_headers = NULL;
$this->response_headers = NULL;
$this->response = NULL;
$this->init();
}

public function _exec() {
$this->response = curl_exec($this->curl);
Expand Down Expand Up @@ -155,4 +170,12 @@ public function _exec() {
public function __destruct() {
$this->close();
}

private function init() {
$this->curl = curl_init();
$this->setUserAgent(self::USER_AGENT);
$this->setopt(CURLINFO_HEADER_OUT, TRUE);
$this->setopt(CURLOPT_HEADER, TRUE);
$this->setopt(CURLOPT_RETURNTRANSFER, TRUE);
}
}
22 changes: 22 additions & 0 deletions tests/CurlTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,28 @@ public function testHeaders() {
'key' => 'HTTP_ACCEPT',
)) === 'application/json');
}

public function testReset()
{
$curl = $this->getMockBuilder(get_class($this->curl))->getMock();
$curl->expects($this->once())->method('reset')->with();
// lets make small request
$curl->setOpt(CURLOPT_CONNECTTIMEOUT_MS, 2000);
$curl->get('http://1.2.3.4/');
$curl->reset();
$this->assertFalse($curl->error);
$this->assertSame(0, $curl->error_code);
$this->assertNull($curl->error_message);
$this->assertFalse($curl->curl_error);
$this->assertSame(0, $curl->curl_error_code);
$this->assertNull($curl->curl_error_message);
$this->assertFalse($curl->http_error);
$this->assertSame(0, $curl->http_status_code);
$this->assertNull($curl->http_error_message);
$this->assertNull($curl->request_headers);
$this->assertNull($curl->response_headers);
$this->assertNull($curl->response);
}

function create_png() {
// PNG image data, 1 x 1, 1-bit colormap, non-interlaced
Expand Down