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

Merge pull request #98 from RusinovIG/master

Browse Source 
Issue with priority of headers
This commit is contained in:
Ahmad Nassri
2016-03-23 00:18:08 -04:00
parent 2bedcf05ac 28080c975c
commit c01f685e3b
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -1,4 +1,5 @@
.DS_Store .DS_Store
.idea
build build
composer.lock composer.lock
composer.phar composer.phar

2
src/Unirest/Request.php
View File

@@ -504,7 +504,7 @@ class Request
{ {
$formattedHeaders = array(); $formattedHeaders = array();
$combinedHeaders = array_change_key_case(array_merge((array) $headers, self::$defaultHeaders)); $combinedHeaders = array_change_key_case(array_merge(self::$defaultHeaders, (array) $headers));
foreach ($combinedHeaders as $key => $val) { foreach ($combinedHeaders as $key => $val) {
$formattedHeaders[] = self::getHeaderString($key, $val); $formattedHeaders[] = self::getHeaderString($key, $val);

6
tests/Unirest/RequestTest.php
View File

@@ -48,6 +48,12 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
$this->assertObjectHasAttribute('header2', $response->body->headers); $this->assertObjectHasAttribute('header2', $response->body->headers);
$this->assertEquals('world', $response->body->headers->header2); $this->assertEquals('world', $response->body->headers->header2);
$response = Request::get('http://mockbin.com/request', ['header1' => 'Custom value']);
$this->assertEquals(200, $response->code);
$this->assertObjectHasAttribute('header1', $response->body->headers);
$this->assertEquals('Custom value', $response->body->headers->header1);
Request::clearDefaultHeaders(); Request::clearDefaultHeaders();
$response = Request::get('http://mockbin.com/request'); $response = Request::get('http://mockbin.com/request');