geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-01 05:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #383 from zachborboa/master

Browse Source 
Ensure Curl::setOpts() returns true when all options are successfully set
This commit is contained in:
Zach Borboa
2016-08-30 00:08:13 -07:00
committed by GitHub
parent dbaedee55c 1edc13b5eb
commit d210489936
4 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/CaseInsensitiveArray.php
+1 -3
View File
@@ -35,7 +35,7 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
*
* @param mixed[] $initial (optional) Existing Array to convert.
*
* @return void
* @return CaseInsensitiveArray
*
* @access public
*/
@@ -205,8 +205,6 @@ class CaseInsensitiveArray implements \ArrayAccess, \Countable, \Iterator
*
* @see https://secure.php.net/manual/en/iterator.valid.php
*
* @param void
*
* @return bool If the current position is valid.
*
* @access public
src/Curl/Curl.php
+10 -2
View File
@@ -403,6 +403,8 @@ class Curl
*
* @access public
* @param $opt
*
* @return mixed
*/
public function getInfo($opt)
{
@@ -514,8 +516,8 @@ class Curl
* @access public
* @param $url
* @param $data
* @param $follow_303_with_post If true, will cause 303 redirections to be followed using
* a POST request (default: false).
* @param $follow_303_with_post
* If true, will cause 303 redirections to be followed using a POST request (default: false).
* Notes:
* - Redirections are only followed if the CURLOPT_FOLLOWLOCATION option is set to true.
* - According to the HTTP specs (see [1]), a 303 redirection should be followed using
@@ -688,6 +690,7 @@ class Curl
*
* @access public
* @param $key
*
* @return mixed
*/
public function getCookie($key)
@@ -700,6 +703,7 @@ class Curl
*
* @access public
* @param $key
*
* @return mixed
*/
public function getResponseCookie($key)
@@ -711,6 +715,7 @@ class Curl
* Get response cookies.
*
* @access public
*
* @return array
*/
public function getResponseCookies()
@@ -745,6 +750,8 @@ class Curl
*
* @access public
* @param $string
*
* @return bool
*/
public function setCookieString($string)
{
@@ -947,6 +954,7 @@ class Curl
return false;
}
}
return true;
}
/**
src/Curl/MultiCurl.php
+2 -2
View File
@@ -193,8 +193,8 @@ class MultiCurl
* @access public
* @param $url
* @param $data
* @param $follow_303_with_post If true, will cause 303 redirections to be followed using
* GET requests (default: false).
* @param $follow_303_with_post
* If true, will cause 303 redirections to be followed using GET requests (default: false).
* Note: Redirections are only followed if the CURLOPT_FOLLOWLOCATION option is set to true.
*
* @return object
tests/PHPCurlClass/PHPCurlClassTest.php
+21 -1
View File
@@ -2837,14 +2837,34 @@ class CurlTest extends PHPUnit_Framework_TestCase
CURLOPT_COOKIE => 'a=b',
);
$curl = new Curl();
@$curl->setOpts($options);
$success = @$curl->setOpts($options);
$reflector = new ReflectionObject($curl);
$property = $reflector->getProperty('options');
$property->setAccessible(true);
$options = $property->getValue($curl);
$this->assertFalse($success);
$this->assertFalse(isset($options[CURLOPT_COOKIE]));
// Ensure Curl::setOpts() returns true when all options are successfully set.
$options = array(
CURLOPT_COOKIE => 'a=b',
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_VERBOSE => true,
);
$curl = new Curl();
$success = $curl->setOpts($options);
$reflector = new ReflectionObject($curl);
$property = $reflector->getProperty('options');
$property->setAccessible(true);
$options = $property->getValue($curl);
$this->assertTrue($success);
$this->assertEquals('a=b', $options[CURLOPT_COOKIE]);
$this->assertTrue($options[CURLOPT_FOLLOWLOCATION]);
$this->assertTrue($options[CURLOPT_VERBOSE]);
}
public function testBuildUrlArgSeparator()