From ca6a3b1daffa181af88d8765ba9ee32ee6953822 Mon Sep 17 00:00:00 2001 From: Igor Rusinov Date: Mon, 18 Jan 2016 23:24:14 +0300 Subject: [PATCH] Fixed setting of default headers array --- src/Unirest/Request.php | 2 +- tests/Unirest/RequestTest.php | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Unirest/Request.php b/src/Unirest/Request.php index 50b744d..e7956b9 100755 --- a/src/Unirest/Request.php +++ b/src/Unirest/Request.php @@ -84,7 +84,7 @@ class Request */ public static function defaultHeaders($headers) { - return array_merge(self::$defaultHeaders, $headers); + return self::$defaultHeaders = array_merge(self::$defaultHeaders, $headers); } /** diff --git a/tests/Unirest/RequestTest.php b/tests/Unirest/RequestTest.php index f09e4a5..82710f2 100644 --- a/tests/Unirest/RequestTest.php +++ b/tests/Unirest/RequestTest.php @@ -39,6 +39,31 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase Unirest\Request::timeout(null); // Cleaning timeout for the other tests } + public function testDefaultHeaders() + { + $defaultHeaders = array( + 'header1' => 'Hello', + 'header2' => 'world' + ); + Unirest\Request::defaultHeaders($defaultHeaders); + + $response = Unirest\Request::get('http://mockbin.com/request'); + + $this->assertEquals(200, $response->code); + $this->assertObjectHasAttribute('header1', $response->body->headers); + $this->assertEquals('Hello', $response->body->headers->header1); + $this->assertObjectHasAttribute('header2', $response->body->headers); + $this->assertEquals('world', $response->body->headers->header2); + + Unirest\Request::clearDefaultHeaders(); + + $response = Unirest\Request::get('http://mockbin.com/request'); + + $this->assertEquals(200, $response->code); + $this->assertObjectNotHasAttribute('header1', $response->body->headers); + $this->assertObjectNotHasAttribute('header2', $response->body->headers); + } + public function testDefaultHeader() { Unirest\Request::defaultHeader('Hello', 'custom');