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

Merge branch 'multiple-curl-info-callback' of https://github.com/matteo78/php-curl-class

Browse Source 
* 'multiple-curl-info-callback' of https://github.com/matteo78/php-curl-class:
  Add unit test for normal getUrl cases
  Split test for getUrl from test for getOptions
  Add call to setUrl in other verbs
  Add call to setUrl in single requests
  Add getUrl, setUrl methods and setUrl call
  Added tests for getUrl method
  Add unit tests
  Add getOpt function
This commit is contained in:
Zach Borboa
2014-09-03 21:37:56 -07:00
parent 66c70db8b7 1c1cfd113a
commit 9d608312a4
2 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+24
View File
@@ -10,6 +10,7 @@ class Curl
private $headers = array();
private $options = array();
private $url = null;
private $multi_parent = false;
private $multi_child = false;
private $before_send_function = null;
@@ -61,6 +62,7 @@ class Curl
foreach ($url_mixed as $url) {
$curl = new Curl();
$curl->multi_child = true;
$curl->setUrl($url);
$curl->setOpt(CURLOPT_URL, $this->buildURL($url, $data), $curl->curl);
$curl->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
$curl->setOpt(CURLOPT_HTTPGET, true);
@@ -99,6 +101,7 @@ class Curl
$this->exec($ch);
}
} else {
$this->setUrl($url_mixed);
$this->setopt(CURLOPT_URL, $this->buildURL($url_mixed, $data));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'GET');
$this->setopt(CURLOPT_HTTPGET, true);
@@ -112,6 +115,7 @@ class Curl
$this->unsetHeader('Content-Length');
}
$this->setUrl($url);
$this->setOpt(CURLOPT_URL, $this->buildURL($url));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'POST');
$this->setOpt(CURLOPT_POST, true);
@@ -121,6 +125,7 @@ class Curl
public function put($url, $data = array())
{
$this->setUrl($url);
$this->setOpt(CURLOPT_URL, $url);
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'PUT');
$put_data = http_build_query($data);
@@ -133,6 +138,7 @@ class Curl
public function patch($url, $data = array())
{
$this->setUrl($url);
$this->unsetHeader('Content-Length');
$this->setOpt(CURLOPT_URL, $this->buildURL($url));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'PATCH');
@@ -142,6 +148,7 @@ class Curl
public function delete($url, $data = array())
{
$this->setUrl($url);
$this->unsetHeader('Content-Length');
$this->setOpt(CURLOPT_URL, $this->buildURL($url, $data));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'DELETE');
@@ -150,6 +157,7 @@ class Curl
public function head($url, $data = array())
{
$this->setUrl($url);
$this->setOpt(CURLOPT_URL, $this->buildURL($url, $data));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'HEAD');
$this->setOpt(CURLOPT_NOBODY, true);
@@ -159,6 +167,7 @@ class Curl
public function options($url, $data = array())
{
$this->unsetHeader('Content-Length');
$this->setUrl($url);
$this->setOpt(CURLOPT_URL, $this->buildURL($url, $data));
$this->setOpt(CURLOPT_CUSTOMREQUEST, 'OPTIONS');
return $this->exec();
@@ -234,6 +243,21 @@ class Curl
$this->options[$option] = $value;
return curl_setopt($ch, $option, $value);
}
public function getOpt($option)
{
return $this->options[$option];
}
public function setUrl($url)
{
$this->url = $url;
}
public function getUrl()
{
return $this->url;
}
public function verbose($on = true)
{
tests/PHPCurlClass/PHPCurlClassTest.php
+41
View File
@@ -91,6 +91,18 @@ class CurlTest extends PHPUnit_Framework_TestCase
'key' => 'REQUEST_METHOD',
)));
}
public function testGetUrl()
{
$test = new Test();
$verbs = array('GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS');
foreach ($verbs as $verb) {
$test->server('server', $verb);
$this->assertEquals(Test::TEST_URL, $test->curl->getUrl());
$test->curl->setUrl(''); // reset url in case of the verb method doesn't set url
}
}
public function testPostRequestMethod()
{
@@ -743,7 +755,36 @@ class CurlTest extends PHPUnit_Framework_TestCase
'key' => 'HTTP_USER_AGENT',
));
}
public function testParallelGetUrl()
{
$test = new Test();
$curl = $test->curl;
$curl->setHeader('X-DEBUG-TEST', 'server');
$curl->complete(function ($instance) {
PHPUnit_Framework_Assert::assertEquals(Test::TEST_URL, $instance->getUrl());
});
$curl->get(array(
Test::TEST_URL,
), array(
'somedata' => 'thatchangesquerystringbutnotoriginaltesturl'
));
}
public function testParallelGetOptions()
{
$test = new Test();
$curl = $test->curl;
$curl->setHeader('X-DEBUG-TEST', 'server');
$curl->setOpt(CURLOPT_USERAGENT, 'useragent');
$curl->complete(function ($instance) {
PHPUnit_Framework_Assert::assertEquals('useragent', $instance->getOpt(CURLOPT_USERAGENT));
});
$curl->get(array(
Test::TEST_URL,
));
}
public function testSuccessCallback()
{
$success_called = false;