Merge pull request #105 from voodoodrul/patch-2

Don't use CURLOPT_CUSTOMREQUEST for POSTs

.gitignore

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

README.md

@@ -37,7 +37,7 @@ To install unirest-php with Composer, just add the following to your `composer.j
 ```json
 {
     "require-dev": {
-        "mashape/unirest-php": "2.*"
+        "mashape/unirest-php": "3.*"
     }
 }
 ```

src/Unirest/Request.php

@@ -159,7 +159,7 @@ class Request
     }
 
     /**
-     * Set a coockie string for enabling coockie handling
+     * Set a cookie string for enabling cookie handling
      *
      * @param string $cookie
      */
@@ -169,7 +169,7 @@ class Request
     }
 
     /**
-     * Set a coockie file path for enabling coockie handling
+     * Set a cookie file path for enabling cookie handling
      *
      * $cookieFile must be a correct path with write permission
      *
@@ -399,7 +399,11 @@ class Request
         self::$handle = curl_init();
 
         if ($method !== Method::GET) {
+			if ($method === Method::POST) {
+				curl_setopt(self::$handle, CURLOPT_POST, true);
+			} else {
 				curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
+			}
 
             curl_setopt(self::$handle, CURLOPT_POSTFIELDS, $body);
         } elseif (is_array($body)) {
@@ -504,7 +508,7 @@ class Request
     {
         $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) {
             $formattedHeaders[] = self::getHeaderString($key, $val);

tests/Unirest/RequestTest.php

@@ -48,6 +48,12 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
         $this->assertObjectHasAttribute('header2', $response->body->headers);
         $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();
 
         $response = Request::get('http://mockbin.com/request');