bitmotor/unirest-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix to deprecated method + more tests

Browse Source
This commit is contained in:
Ahmad Nassri
2015-02-05 13:00:49 -05:00
parent 8af870ff69
commit d5a7ad40bd
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Unirest/Request.php
View File

@@ -345,7 +345,7 @@ class Request
// supporting deprecated http auth method // supporting deprecated http auth method
if (!empty($username)) { if (!empty($username)) {
curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC); curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
curl_setopt($ch, CURLOPT_USERPWD, self::$auth['user'] . ':' . self::$auth['pass']); curl_setopt($ch, CURLOPT_USERPWD, $username . ':' . $password);
} }
if (!empty(self::$auth['user'])) { if (!empty(self::$auth['user'])) {

10
tests/Unirest/RequestTest.php
View File

@@ -71,13 +71,21 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(true, $args->gzipped); $this->assertEquals(true, $args->gzipped);
} }
public function testBasicAuthentication() public function testBasicAuthenticationDeprecated()
{ {
$response = Unirest\Request::get('http://httpbin.org/get', array(), array(), 'user', 'password'); $response = Unirest\Request::get('http://httpbin.org/get', array(), array(), 'user', 'password');
$headers = $response->body->headers; $headers = $response->body->headers;
$this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $headers->Authorization); $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $headers->Authorization);
} }
public function testBasicAuthentication()
{
Unirest\Request::auth('user', 'password');
$response = Unirest\Request::get('http://httpbin.org/get');
$this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $response->body->headers->Authorization);
}
public function testCustomHeaders() public function testCustomHeaders()
{ {
$response = Unirest\Request::get('http://httpbin.org/get', array( $response = Unirest\Request::get('http://httpbin.org/get', array(