Merge pull request #98 from RusinovIG/master

Issue with priority of headers

.gitignore

@@ -1,5 +1,7 @@
 .DS_Store
+.idea
 build
-vendor
 composer.lock
 composer.phar
+coverage
+vendor

.travis.yml

@@ -1,9 +1,12 @@
+sudo: false
+
 language: php
 
 php:
-  - 5.4
-  - 5.5
-  - 5.6
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
   - hhvm
 
 before_script:

README.md

@@ -7,7 +7,11 @@
 [![Gitter][gitter-image]][gitter-url]
 [![License][packagist-license]][license-url]
 
-Unirest is a set of lightweight HTTP libraries available in [multiple languages](http://unirest.io).
+![][unirest-logo]
+
+
+[Unirest](http://unirest.io) is a set of lightweight HTTP libraries available in multiple languages, built and maintained by [Mashape](https://github.com/Mashape), who also maintain the open-source API Gateway [Kong](https://github.com/Mashape/kong). 
+
 
 ## Features
 
@@ -47,7 +51,7 @@ composer require mashape/unirest-php
 This will get you the latest version of the reporter and install it. If you do want the master, untagged, version you may use the command below:
 
 ```shell
-composer require mashape/php-test-reporter:@dev-master
+composer require mashape/php-test-reporter dev-master
 ```
 
 Composer installs autoloader at `./vendor/autoloader.php`. to include the library in your script, add:
@@ -79,10 +83,10 @@ require_once '/path/to/unirest-php/src/Unirest.php';
 So you're probably wondering how using Unirest makes creating requests in PHP easier, let's look at a working example:
 
 ```php
-$headers = array("Accept" => "application/json");
-$body = array("foo" => "hellow", "bar" => "world");
+$headers = array('Accept' => 'application/json');
+$query = array('foo' => 'hello', 'bar' => 'world');
 
-$response = Unirest\Request::post("http://mockbin.com/request", $headers, $body);
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $query);
 
 $response->code;        // HTTP Status code
 $response->headers;     // Headers
@@ -90,25 +94,98 @@ $response->body;        // Parsed body
 $response->raw_body;    // Unparsed body
 ```
 
-### File Uploads
+### JSON Requests *(`application/json`)*
 
-To upload files in a multipart form representation use the return value of `Unirest\File::add($path)` as the value of a parameter:
+A JSON Request can be constructed using the `Unirest\Request\Body::Json` helper:
 
 ```php
-$headers = array("Accept" => "application/json");
-$body = array("file" => Unirest\File::add("/tmp/file.txt"));
+$headers = array('Accept' => 'application/json');
+$data = array('name' => 'ahmad', 'company' => 'mashape');
 
-$response = Unirest\Request::post("http://mockbin.com/request", $headers, $body);
+$body = Unirest\Request\Body::json($data);
+
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
+```
+
+**Notes:**
+- `Content-Type` headers will be automatically set to `application/json` 
+- the data variable will be processed through [`json_encode`](http://php.net/manual/en/function.json-encode.php) with default values for arguments.
+- an error will be thrown if the [JSON Extension](http://php.net/manual/en/book.json.php) is not available.
+
+### Form Requests *(`application/x-www-form-urlencoded`)*
+
+A typical Form Request can be constructed using the `Unirest\Request\Body::Form` helper:
+
+```php
+$headers = array('Accept' => 'application/json');
+$data = array('name' => 'ahmad', 'company' => 'mashape');
+
+$body = Unirest\Request\Body::form($data);
+
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
+```
+
+**Notes:** 
+- `Content-Type` headers will be automatically set to `application/x-www-form-urlencoded`
+- the final data array will be processed through [`http_build_query`](http://php.net/manual/en/function.http-build-query.php) with default values for arguments.
+
+### Multipart Requests *(`multipart/form-data`)*
+
+A Multipart Request can be constructed using the `Unirest\Request\Body::Multipart` helper:
+
+```php
+$headers = array('Accept' => 'application/json');
+$data = array('name' => 'ahmad', 'company' => 'mashape');
+
+$body = Unirest\Request\Body::multipart($data);
+
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
+```
+
+**Notes:** 
+
+- `Content-Type` headers will be automatically set to `multipart/form-data`.
+- an auto-generated `--boundary` will be set.
+
+### Multipart File Upload
+
+simply add an array of files as the second argument to to the `Multipart` helper:
+
+```php
+$headers = array('Accept' => 'application/json');
+$data = array('name' => 'ahmad', 'company' => 'mashape');
+$files = array('bio' => '/path/to/bio.txt', 'avatar' => '/path/to/avatar.jpg');
+
+$body = Unirest\Request\Body::multipart($data, $files);
+
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
  ```
 
-### Custom Entity Body
+If you wish to further customize the properties of files uploaded you can do so with the `Unirest\Request\Body::File` helper:
 
-Sending a custom body such as a JSON Object rather than a string or form style parameters we utilize json_encode for the body:
 ```php
-$headers = array("Accept" => "application/json");
-$body =   json_encode(array("foo" => "hellow", "bar" => "world"));
+$headers = array('Accept' => 'application/json');
+$body = array(
+    'name' => 'ahmad', 
+    'company' => 'mashape'
+    'bio' => Unirest\Request\Body::file('/path/to/bio.txt', 'text/plain'),
+    'avatar' => Unirest\Request\Body::file('/path/to/my_avatar.jpg', 'text/plain', 'avatar.jpg')
+);
 
-$response = Unirest\Request::post("http://mockbin.com/request", $headers, $body);
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
+ ```
+
+**Note**: we did not use the `Unirest\Request\Body::multipart` helper in this example, it is not needed when manually adding files.
+ 
+### Custom Body
+
+Sending a custom body such rather than using the `Unirest\Request\Body` helpers is also possible, for example, using a [`serialize`](http://php.net/manual/en/function.serialize.php) body string with a custom `Content-Type`:
+
+```php
+$headers = array('Accept' => 'application/json', 'Content-Type' => 'application/x-php-serialized');
+$body = serialize((array('foo' => 'hello', 'bar' => 'world'));
+
+$response = Unirest\Request::post('http://mockbin.com/request', $headers, $body);
 ```
 
 ### Authentication
@@ -152,7 +229,7 @@ Unirest\Request::proxyAuth('username', 'password', CURLAUTH_DIGEST);
 Previous versions of **Unirest** support *Basic Authentication* by providing the `username` and `password` arguments:
 
 ```php
-$response = Unirest\Request::get("http://mockbin.com/request", null, null, "username", "password");
+$response = Unirest\Request::get('http://mockbin.com/request', null, null, 'username', 'password');
 ```
 
 **This has been deprecated, and will be completely removed in `v.3.0.0` please use the `Unirest\Request::auth()` method instead**
@@ -271,16 +348,16 @@ Unirest\Request::proxyAuth('username', 'password', CURLAUTH_DIGEST);
 You can set default headers that will be sent on every request:
 
 ```php
-Unirest\Request::defaultHeader("Header1", "Value1");
-Unirest\Request::defaultHeader("Header2", "Value2");
+Unirest\Request::defaultHeader('Header1', 'Value1');
+Unirest\Request::defaultHeader('Header2', 'Value2');
 ```
 
 You can set default headers in bulk by passing an array:
 
 ```php
 Unirest\Request::defaultHeaders(array(
-    "Header1" => "Value1",
-    "Header2" => "Value2"
+    'Header1' => 'Value1',
+    'Header2' => 'Value2'
 ));
 ```
 
@@ -295,14 +372,14 @@ Unirest\Request::clearDefaultHeaders();
 You can set default [cURL options](http://php.net/manual/en/function.curl-setopt.php) that will be sent on every request:
 
 ```php
-Unirest\Request::curlOpt(CURLOPT_COOKIE, "foo=bar");
+Unirest\Request::curlOpt(CURLOPT_COOKIE, 'foo=bar');
 ```
 
 You can set options bulk by passing an array:
 
 ```php
 Unirest\Request::curlOpts(array(
-    CURLOPT_COOKIE => "foo=bar"
+    CURLOPT_COOKIE => 'foo=bar'
 ));
 ```
 
@@ -336,6 +413,9 @@ Unirest\Request::getCurlHandle()
 
 Made with ♥ from the [Mashape][mashape-url] team
 
+[unirest-logo]: http://cl.ly/image/2P373Y090s2O/Image%202015-10-12%20at%209.48.06%20PM.png
+
+
 [mashape-url]: https://www.mashape.com/
 
 [license-url]: https://github.com/Mashape/unirest-php/blob/master/LICENSE

composer.json

@@ -8,8 +8,10 @@
   "author": "Mashape <opensource@mashape.com> (https://www.mashape.com)",
   "require": {
     "php": ">=5.4.0",
-    "ext-curl": "*",
-    "ext-json": "*"
+    "ext-curl": "*"
+  },
+  "suggest": {
+    "ext-json": "Allows using JSON Bodies for sending and parsing requests"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.4",

src/Unirest.php

@@ -1,6 +1,7 @@
 <?php
 
-require_once dirname(__FILE__) . '/Unirest/File.php';
+require_once dirname(__FILE__) . '/Unirest/Exception.php';
 require_once dirname(__FILE__) . '/Unirest/Method.php';
 require_once dirname(__FILE__) . '/Unirest/Response.php';
 require_once dirname(__FILE__) . '/Unirest/Request.php';
+require_once dirname(__FILE__) . '/Unirest/Request/Body.php';

src/Unirest/Exception.php

@@ -0,0 +1,5 @@
+<?php
+
+namespace Unirest;
+
+class Exception extends \Exception {}

src/Unirest/File.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Unirest;
-
-class File
-{
-    /**
-     * Prepares a file for upload. To be used inside the parameters declaration for a request.
-     * @param string $path The file path
-     */
-    public static function add($filename, $mimetype = '', $postname = '')
-    {
-        if (function_exists('curl_file_create')) {
-            return curl_file_create($filename, $mimetype = '', $postname = '');
-        } else {
-            return sprintf('@%s;filename=%s;type=%s', $filename, $postname ?: basename($filename), $mimetype);
-        }
-    }
-}

src/Unirest/Request.php

@@ -2,8 +2,9 @@
 
 namespace Unirest;
 
-use Unirest\Method;
-use Unirest\Response;
+use Unirest\Method as Method;
+use Unirest\Response as Response;
+use Unirest\Exception as Exception;
 
 class Request
 {
@@ -39,8 +40,9 @@ class Request
      * Set JSON decode mode
      *
      * @param bool $assoc When TRUE, returned objects will be converted into associative arrays.
-     * @param bool $depth User specified recursion depth.
-     * @param bool $options Bitmask of JSON decode options. Currently only JSON_BIGINT_AS_STRING is supported (default is to cast large integers as floats)
+     * @param integer $depth User specified recursion depth.
+     * @param integer $options Bitmask of JSON decode options. Currently only JSON_BIGINT_AS_STRING is supported (default is to cast large integers as floats)
+     * @return array
      */
     public static function jsonOpts($assoc = false, $depth = 512, $options = 0)
     {
@@ -51,6 +53,7 @@ class Request
      * Verify SSL peer
      *
      * @param bool $enabled enable SSL verification, by default is true
+     * @return bool
      */
     public static function verifyPeer($enabled)
     {
@@ -61,6 +64,7 @@ class Request
      * Verify SSL host
      *
      * @param bool $enabled enable SSL host verification, by default is true
+     * @return bool
      */
     public static function verifyHost($enabled)
     {
@@ -71,6 +75,7 @@ class Request
      * Set a timeout
      *
      * @param integer $seconds timeout value in seconds
+     * @return integer
      */
     public static function timeout($seconds)
     {
@@ -84,7 +89,7 @@ class Request
      */
     public static function defaultHeaders($headers)
     {
-        return array_merge(self::$defaultHeaders, $headers);
+        return self::$defaultHeaders = array_merge(self::$defaultHeaders, $headers);
     }
 
     /**
@@ -92,6 +97,7 @@ class Request
      *
      * @param string $name header name
      * @param string $value header value
+     * @return string
      */
     public static function defaultHeader($name, $value)
     {
@@ -110,10 +116,11 @@ class Request
      * Set curl options to send on every request
      *
      * @param array $options options array
+     * @return array
      */
-    public static function curlOpts($opts)
+    public static function curlOpts($options)
     {
-        return array_merge(self::$curlOpts, $opts);
+        return self::mergeCurlOptions(self::$curlOpts, $options);
     }
 
     /**
@@ -121,6 +128,7 @@ class Request
      *
      * @param string $name header name
      * @param string $value header value
+     * @return string
      */
     public static function curlOpt($name, $value)
     {
@@ -143,6 +151,7 @@ class Request
      *       Be aware of which key you are using and do not share your Production key.
      *
      * @param string $key Mashape key
+     * @return string
      */
     public static function setMashapeKey($key)
     {
@@ -176,7 +185,7 @@ class Request
      *
      * @param string $username authentication username
      * @param string $password authentication password
-     * @param string $method authentication method
+     * @param integer $method authentication method
      */
     public static function auth($username = '', $password = '', $method = CURLAUTH_BASIC)
     {
@@ -189,9 +198,9 @@ class Request
      * Set proxy to use
      *
      * @param string $address proxy address
-     * @param string $port proxy port
-     * @param string $port proxy type (Available options for this are CURLPROXY_HTTP, CURLPROXY_HTTP_1_0 CURLPROXY_SOCKS4, CURLPROXY_SOCKS5, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5_HOSTNAME)
-     * @param string $tunnel enable/disable tunneling
+     * @param integer $port proxy port
+     * @param integer $type (Available options for this are CURLPROXY_HTTP, CURLPROXY_HTTP_1_0 CURLPROXY_SOCKS4, CURLPROXY_SOCKS5, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5_HOSTNAME)
+     * @param bool $tunnel enable/disable tunneling
      */
     public static function proxy($address, $port = 1080, $type = CURLPROXY_HTTP, $tunnel = false)
     {
@@ -206,8 +215,7 @@ class Request
      *
      * @param string $username authentication username
      * @param string $password authentication password
-     * @param string $method authentication method
-     * @param string $tunnel enable/disable tunneling
+     * @param integer $method authentication method
      */
     public static function proxyAuth($username = '', $password = '', $method = CURLAUTH_BASIC)
     {
@@ -224,7 +232,7 @@ class Request
      * @param mixed $parameters parameters to send in the querystring
      * @param string $username Authentication username (deprecated)
      * @param string $password Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function get($url, $headers = array(), $parameters = null, $username = null, $password = null)
     {
@@ -238,7 +246,7 @@ class Request
      * @param mixed $parameters parameters to send in the querystring
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function head($url, $headers = array(), $parameters = null, $username = null, $password = null)
     {
@@ -252,7 +260,7 @@ class Request
      * @param mixed $parameters parameters to send in the querystring
      * @param string $username Basic Authentication username
      * @param string $password Basic Authentication password
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function options($url, $headers = array(), $parameters = null, $username = null, $password = null)
     {
@@ -266,7 +274,7 @@ class Request
      * @param mixed $parameters parameters to send in the querystring
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function connect($url, $headers = array(), $parameters = null, $username = null, $password = null)
     {
@@ -280,7 +288,7 @@ class Request
      * @param mixed $body POST body data
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response response
      */
     public static function post($url, $headers = array(), $body = null, $username = null, $password = null)
     {
@@ -294,7 +302,7 @@ class Request
      * @param mixed $body DELETE body data
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function delete($url, $headers = array(), $body = null, $username = null, $password = null)
     {
@@ -308,7 +316,7 @@ class Request
      * @param mixed $body PUT body data
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function put($url, $headers = array(), $body = null, $username = null, $password = null)
     {
@@ -322,7 +330,7 @@ class Request
      * @param mixed $body PATCH body data
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function patch($url, $headers = array(), $body = null, $username = null, $password = null)
     {
@@ -336,7 +344,7 @@ class Request
      * @param mixed $body TRACE body data
      * @param string $username Basic Authentication username (deprecated)
      * @param string $password Basic Authentication password (deprecated)
-     * @return string|stdObj response string or stdObj if response is json-decodable
+     * @return Unirest\Response
      */
     public static function trace($url, $headers = array(), $body = null, $username = null, $password = null)
     {
@@ -346,6 +354,9 @@ class Request
     /**
      * This function is useful for serializing multidimensional arrays, and avoid getting
      * the 'Array to string conversion' notice
+     * @param array|object $data array to flatten.
+     * @param bool|string $parent parent key or false if no parent
+     * @return array
      */
     public static function buildHTTPCurlQuery($data, $parent = false)
     {
@@ -374,30 +385,23 @@ class Request
 
     /**
      * Send a cURL request
-     * @param Unirest\Method $method HTTP method to use
+     * @param Unirest\Method|string $method HTTP method to use
      * @param string $url URL to send the request to
      * @param mixed $body request body
      * @param array $headers additional headers to send
      * @param string $username Authentication username (deprecated)
      * @param string $password Authentication password (deprecated)
-     * @throws Exception if a cURL error occurs
+     * @throws Unirest\Exception if a cURL error occurs
      * @return Unirest\Response
      */
     public static function send($method, $url, $body = null, $headers = array(), $username = null, $password = null)
     {
         self::$handle = curl_init();
 
-        // start with default options
-        curl_setopt_array(self::$handle, self::$curlOpts);
-
         if ($method !== Method::GET) {
             curl_setopt(self::$handle, CURLOPT_CUSTOMREQUEST, $method);
 
-            if (is_array($body) || $body instanceof \Traversable) {
-                curl_setopt(self::$handle, CURLOPT_POSTFIELDS, self::buildHTTPCurlQuery($body));
-            } else {
             curl_setopt(self::$handle, CURLOPT_POSTFIELDS, $body);
-            }
         } elseif (is_array($body)) {
             if (strpos($url, '?') !== false) {
                 $url .= '&';
@@ -408,7 +412,7 @@ class Request
             $url .= urldecode(http_build_query(self::buildHTTPCurlQuery($body)));
         }
 
-        curl_setopt_array(self::$handle, array(
+        $curl_base_options = [
             CURLOPT_URL => self::encodeUrl($url),
             CURLOPT_RETURNTRANSFER => true,
             CURLOPT_FOLLOWLOCATION => true,
@@ -420,7 +424,9 @@ class Request
             CURLOPT_SSL_VERIFYHOST => self::$verifyHost === false ? 0 : 2,
             // If an empty string, '', is set, a header containing all supported encoding types is sent
             CURLOPT_ENCODING => ''
-        ));
+        ];
+
+        curl_setopt_array(self::$handle, self::mergeCurlOptions($curl_base_options, self::$curlOpts));
 
         if (self::$socketTimeout !== null) {
             curl_setopt(self::$handle, CURLOPT_TIMEOUT, self::$socketTimeout);
@@ -466,7 +472,7 @@ class Request
         $info       = self::getInfo();
 
         if ($error) {
-            throw new \Exception($error);
+            throw new Exception($error);
         }
 
         // Split the full response in its headers and body
@@ -498,7 +504,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);
@@ -558,4 +564,15 @@ class Request
         $key = trim(strtolower($key));
         return $key . ': ' . $val;
     }
+
+    /**
+     * @param array $existing_options
+     * @param array $new_options
+     * @return array
+     */
+    private static function mergeCurlOptions(&$existing_options, $new_options)
+    {
+        $existing_options = $new_options + $existing_options;
+        return $existing_options;
+    }
 }

src/Unirest/Request/Body.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Unirest\Request;
+
+use Unirest\Request as Request;
+use Unirest\Exception as Exception;
+
+class Body
+{
+    /**
+     * Prepares a file for upload. To be used inside the parameters declaration for a request.
+     * @param string $filename The file path
+     * @param string $mimetype MIME type
+     * @param string $postname the file name
+     * @return string|\CURLFile
+     */
+    public static function File($filename, $mimetype = '', $postname = '')
+    {
+        if (class_exists('CURLFile')) {
+            return new \CURLFile($filename, $mimetype, $postname);
+        }
+
+        if (function_exists('curl_file_create')) {
+            return curl_file_create($filename, $mimetype, $postname);
+        }
+
+        return sprintf('@%s;filename=%s;type=%s', $filename, $postname ?: basename($filename), $mimetype);
+    }
+
+    public static function Json($data)
+    {
+        if (!function_exists('json_encode')) {
+            throw new Exception('JSON Extension not available');
+        }
+
+        return json_encode($data);
+    }
+
+    public static function Form($data)
+    {
+        if (is_array($data) || is_object($data) || $data instanceof \Traversable) {
+            return http_build_query(Request::buildHTTPCurlQuery($data));
+        }
+
+        return $data;
+    }
+
+    public static function Multipart($data, $files = false)
+    {
+        if (is_object($data)) {
+            return get_object_vars($data);
+        }
+
+        if (!is_array($data)) {
+            return array($data);
+        }
+
+        if ($files !== false) {
+            foreach ($files as $name => $file) {
+                $data[$name] = call_user_func(array(__CLASS__, 'File'), $file);
+            }
+        }
+
+        return $data;
+    }
+}

src/Unirest/Response.php

@@ -25,18 +25,22 @@ class Response
         // make sure raw_body is the first argument
         array_unshift($json_args, $raw_body);
 
+        if (function_exists('json_decode')) {
             $json = call_user_func_array('json_decode', $json_args);
 
             if (json_last_error() === JSON_ERROR_NONE) {
                 $this->body = $json;
             }
         }
+    }
 
     /**
      * if PECL_HTTP is not available use a fall back function
      *
      * thanks to ricardovermeltfoort@gmail.com
      * http://php.net/manual/en/function.http-parse-headers.php#112986
+     * @param string $raw_headers raw headers
+     * @return array
      */
     private function parseHeaders($raw_headers)
     {

tests/Unirest/BodyTest.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace Unirest\Request\Body\Test;
+
+use Unirest\Request as Request;
+use Unirest\Request\Body as Body;
+
+require_once __DIR__ . '/../../src/Unirest.php';
+
+class BodyTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCURLFile()
+    {
+        $fixture = __DIR__ . '/fixtures/upload.txt';
+
+        $file = Body::File($fixture);
+
+        if (PHP_MAJOR_VERSION === 5 && PHP_MINOR_VERSION === 4) {
+            $this->assertEquals($file, sprintf('@%s;filename=%s;type=', $fixture, basename($fixture)));
+        } else {
+            $this->assertTrue($file instanceof \CURLFile);
+        }
+    }
+
+    public function testHttpBuildQueryWithCurlFile()
+    {
+        $fixture = __DIR__ . '/fixtures/upload.txt';
+
+        $file = Body::File($fixture);
+        $body = array(
+            'to' => 'mail@mailinator.com',
+            'from' => 'mail@mailinator.com',
+            'file' => $file
+        );
+
+        $result = Request::buildHTTPCurlQuery($body);
+        $this->assertEquals($result['file'], $file);
+    }
+
+    public function testJson()
+    {
+        $body = Body::Json(array('foo', 'bar'));
+
+        $this->assertEquals($body, '["foo","bar"]');
+    }
+
+    public function testForm()
+    {
+        $body = Body::Form(array('foo' => 'bar', 'bar' => 'baz'));
+
+        $this->assertEquals($body, 'foo=bar&bar=baz');
+
+        // try again with a string
+        $body = Body::Form($body);
+
+        $this->assertEquals($body, 'foo=bar&bar=baz');
+    }
+
+    public function testMultipart()
+    {
+        $arr = array('foo' => 'bar', 'bar' => 'baz');
+
+        $body = Body::Multipart((object) $arr);
+
+        $this->assertEquals($body, $arr);
+
+        $body = Body::Multipart('flat');
+
+        $this->assertEquals($body, array('flat'));
+    }
+
+    public function testMultipartFiles()
+    {
+        $fixture = __DIR__ . '/fixtures/upload.txt';
+
+        $data = array('foo' => 'bar', 'bar' => 'baz');
+        $files = array('test' => $fixture);
+
+        $body = Body::Multipart($data, $files);
+
+        // echo $body;
+
+        $this->assertEquals($body, array(
+            'foo' => 'bar',
+            'bar' => 'baz',
+            'test' => Body::File($fixture)
+        ));
+    }
+}

tests/Unirest/FileTest.php

@@ -1,17 +0,0 @@
-<?php
-
-use Unirest\File as File;
-
-class UnirestFileTest extends \PHPUnit_Framework_TestCase
-{
-    public function testCURLFile()
-    {
-        $file = File::add(UPLOAD_FIXTURE);
-
-        if (PHP_MAJOR_VERSION === 5 && PHP_MINOR_VERSION === 4) {
-            $this->assertEquals($file, sprintf('@%s;filename=%s;type=', UPLOAD_FIXTURE, basename(UPLOAD_FIXTURE)));
-        } else {
-            $this->assertTrue($file instanceof \CURLFile);
-        }
-    }
-}

tests/Unirest/RequestTest.php

@@ -1,57 +1,81 @@
 <?php
 
+namespace Unirest\Request\Test;
+
+use Unirest\Request as Request;
+
+require __DIR__ . '/../../src/Unirest.php';
+
 class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 {
     // Generic
-    public function testHttpBuildQueryWhenCurlFile()
-    {
-        $file = Unirest\File::add(UPLOAD_FIXTURE);
-        $body = array(
-            'to' => 'mail@mailinator.com',
-            'from' => 'mail@mailinator.com',
-            'file' => $file
-        );
-
-        $result = Unirest\Request::buildHTTPCurlQuery($body);
-        $this->assertEquals($result['file'], $file);
-    }
-
     public function testCurlOpts()
     {
-        Unirest\Request::curlOpt(CURLOPT_COOKIE, 'foo=bar');
+        Request::curlOpt(CURLOPT_COOKIE, 'foo=bar');
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertTrue(property_exists($response->body->cookies, 'foo'));
 
-        Unirest\Request::clearCurlOpts();
+        Request::clearCurlOpts();
     }
 
     /**
-     * @expectedException Exception
+     * @expectedException \Unirest\Exception
      */
     public function testTimeoutFail()
     {
-        Unirest\Request::timeout(1);
+        Request::timeout(1);
 
-        Unirest\Request::get('http://mockbin.com/delay/1000');
+        Request::get('http://mockbin.com/delay/1000');
 
-        Unirest\Request::timeout(null); // Cleaning timeout for the other tests
+        Request::timeout(null); // Cleaning timeout for the other tests
+    }
+
+    public function testDefaultHeaders()
+    {
+        $defaultHeaders = array(
+            'header1' => 'Hello',
+            'header2' => 'world'
+        );
+        Request::defaultHeaders($defaultHeaders);
+
+        $response = 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);
+
+        $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');
+
+        $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');
+        Request::defaultHeader('Hello', 'custom');
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals(200, $response->code);
         $this->assertTrue(property_exists($response->body->headers, 'hello'));
         $this->assertEquals('custom', $response->body->headers->hello);
 
-        Unirest\Request::clearDefaultHeaders();
+        Request::clearDefaultHeaders();
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals(200, $response->code);
         $this->assertFalse(property_exists($response->body->headers, 'hello'));
@@ -59,24 +83,24 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testSetMashapeKey()
     {
-        Unirest\Request::setMashapeKey('abcd');
+        Request::setMashapeKey('abcd');
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals(200, $response->code);
         $this->assertTrue(property_exists($response->body->headers, 'x-mashape-key'));
         $this->assertEquals('abcd', $response->body->headers->{'x-mashape-key'});
 
         // send another request
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals(200, $response->code);
         $this->assertTrue(property_exists($response->body->headers, 'x-mashape-key'));
         $this->assertEquals('abcd', $response->body->headers->{'x-mashape-key'});
 
-        Unirest\Request::clearDefaultHeaders();
+        Request::clearDefaultHeaders();
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals(200, $response->code);
         $this->assertFalse(property_exists($response->body->headers, 'x-mashape-key'));
@@ -84,30 +108,30 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGzip()
     {
-        $response = Unirest\Request::get('http://mockbin.com/gzip/request');
+        $response = Request::get('http://mockbin.com/gzip/request');
 
         $this->assertEquals('gzip', $response->headers['Content-Encoding']);
     }
 
     public function testBasicAuthenticationDeprecated()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(), array(), 'user', 'password');
+        $response = Request::get('http://mockbin.com/request', array(), array(), 'user', 'password');
 
         $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $response->body->headers->authorization);
     }
 
     public function testBasicAuthentication()
     {
-        Unirest\Request::auth('user', 'password');
+        Request::auth('user', 'password');
 
-        $response = Unirest\Request::get('http://mockbin.com/request');
+        $response = Request::get('http://mockbin.com/request');
 
         $this->assertEquals('Basic dXNlcjpwYXNzd29yZA==', $response->body->headers->authorization);
     }
 
     public function testCustomHeaders()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'user-agent' => 'unirest-php',
         ));
 
@@ -118,7 +142,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // GET
     public function testGet()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request?name=Mark', array(
+        $response = Request::get('http://mockbin.com/request?name=Mark', array(
             'Accept' => 'application/json'
         ), array(
             'nick' => 'thefosk'
@@ -132,7 +156,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetMultidimensionalArray()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'key' => 'value',
@@ -151,7 +175,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetWithDots()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'user.name' => 'Mark',
@@ -166,7 +190,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetWithDotsAlt()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'user.name' => 'Mark Bond',
@@ -180,7 +204,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     }
     public function testGetWithEqualSign()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark=Hello'
@@ -193,7 +217,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetWithEqualSignAlt()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(
+        $response = Request::get('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark=Hello=John'
@@ -206,7 +230,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetWithComplexQuery()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request?query=[{"type":"/music/album","name":null,"artist":{"id":"/en/bob_dylan"},"limit":3}]&cursor');
+        $response = Request::get('http://mockbin.com/request?query=[{"type":"/music/album","name":null,"artist":{"id":"/en/bob_dylan"},"limit":3}]&cursor');
 
         $this->assertEquals(200, $response->code);
         $this->assertEquals('GET', $response->body->method);
@@ -216,7 +240,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testGetArray()
     {
-        $response = Unirest\Request::get('http://mockbin.com/request', array(), array(
+        $response = Request::get('http://mockbin.com/request', array(), array(
             'name[0]' => 'Mark',
             'name[1]' => 'John'
         ));
@@ -230,7 +254,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // POST
     public function testPost()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark',
@@ -243,14 +267,52 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('thefosk', $response->body->postData->params->nick);
     }
 
+    public function testPostForm()
+    {
+        $body = Request\Body::Form(array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $response = Request::post('http://mockbin.com/request', array(
+            'Accept' => 'application/json'
+        ), $body);
+
+        $this->assertEquals('POST', $response->body->method);
+        $this->assertEquals('application/x-www-form-urlencoded', $response->body->headers->{'content-type'});
+        $this->assertEquals('application/x-www-form-urlencoded', $response->body->postData->mimeType);
+        $this->assertEquals('Mark', $response->body->postData->params->name);
+        $this->assertEquals('thefosk', $response->body->postData->params->nick);
+    }
+
+    public function testPostMultipart()
+    {
+        $body = Request\Body::Multipart(array(
+            'name' => 'Mark',
+            'nick' => 'thefosk'
+        ));
+
+        $response = Request::post('http://mockbin.com/request', (object) array(
+            'Accept' => 'application/json',
+        ), $body);
+
+        $this->assertEquals('POST', $response->body->method);
+        $this->assertEquals('multipart/form-data', explode(';', $response->body->headers->{'content-type'})[0]);
+        $this->assertEquals('multipart/form-data', $response->body->postData->mimeType);
+        $this->assertEquals('Mark', $response->body->postData->params->name);
+        $this->assertEquals('thefosk', $response->body->postData->params->nick);
+    }
+
     public function testPostWithEqualSign()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
-            'Accept' => 'application/json'
-        ), array(
+        $body = Request\Body::Form(array(
             'name' => 'Mark=Hello'
         ));
 
+        $response = Request::post('http://mockbin.com/request', array(
+            'Accept' => 'application/json'
+        ), $body);
+
         $this->assertEquals(200, $response->code);
         $this->assertEquals('POST', $response->body->method);
         $this->assertEquals('Mark=Hello', $response->body->postData->params->name);
@@ -258,7 +320,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testPostArray()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name[0]' => 'Mark',
@@ -273,7 +335,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testPostWithDots()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'user.name' => 'Mark',
@@ -288,7 +350,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testRawPost()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json',
             'Content-Type' => 'application/json'
         ), json_encode(array(
@@ -302,9 +364,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testPostMultidimensionalArray()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
-            'Accept' => 'application/json'
-        ), array(
+        $body = Request\Body::Form(array(
             'key' => 'value',
             'items' => array(
                 'item1',
@@ -312,6 +372,10 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
             )
         ));
 
+        $response = Request::post('http://mockbin.com/request', array(
+            'Accept' => 'application/json'
+        ), $body);
+
         $this->assertEquals(200, $response->code);
         $this->assertEquals('POST', $response->body->method);
         $this->assertEquals('value', $response->body->postData->params->key);
@@ -322,7 +386,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // PUT
     public function testPut()
     {
-        $response = Unirest\Request::put('http://mockbin.com/request', array(
+        $response = Request::put('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark',
@@ -338,7 +402,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // PATCH
     public function testPatch()
     {
-        $response = Unirest\Request::patch('http://mockbin.com/request', array(
+        $response = Request::patch('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark',
@@ -354,7 +418,7 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // DELETE
     public function testDelete()
     {
-        $response = Unirest\Request::delete('http://mockbin.com/request', array(
+        $response = Request::delete('http://mockbin.com/request', array(
             'Accept' => 'application/json',
             'Content-Type' => 'application/x-www-form-urlencoded'
         ), array(
@@ -369,11 +433,31 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
     // Upload
     public function testUpload()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $fixture = __DIR__ . '/../fixtures/upload.txt';
+
+        $headers = array('Accept' => 'application/json');
+        $files = array('file' => $fixture);
+        $data = array('name' => 'ahmad');
+
+        $body = Request\Body::Multipart($data, $files);
+
+        $response = Request::post('http://mockbin.com/request', $headers, $body);
+
+        $this->assertEquals(200, $response->code);
+        $this->assertEquals('POST', $response->body->method);
+        $this->assertEquals('ahmad', $response->body->postData->params->name);
+        $this->assertEquals('This is a test', $response->body->postData->params->file);
+    }
+
+    public function testUploadWithoutHelper()
+    {
+        $fixture = __DIR__ . '/../fixtures/upload.txt';
+
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark',
-            'file' => Unirest\File::add(UPLOAD_FIXTURE)
+            'file' => Request\Body::File($fixture)
         ));
 
         $this->assertEquals(200, $response->code);
@@ -384,11 +468,13 @@ class UnirestRequestTest extends \PHPUnit_Framework_TestCase
 
     public function testUploadIfFilePartOfData()
     {
-        $response = Unirest\Request::post('http://mockbin.com/request', array(
+        $fixture = __DIR__ . '/../fixtures/upload.txt';
+
+        $response = Request::post('http://mockbin.com/request', array(
             'Accept' => 'application/json'
         ), array(
             'name' => 'Mark',
-            'files[owl.gif]' => Unirest\File::add(UPLOAD_FIXTURE)
+            'files[owl.gif]' => Request\Body::File($fixture)
         ));
 
         $this->assertEquals(200, $response->code);

tests/Unirest/ResponseTest.php

@@ -1,27 +1,34 @@
 <?php
 
+namespace Unirest\Response\Test;
+
+use Unirest\Request as Request;
+use Unirest\Response as Response;
+
+require __DIR__ . '/../../src/Unirest.php';
+
 class UnirestResponseTest extends \PHPUnit_Framework_TestCase
 {
     public function testJSONAssociativeArrays()
     {
-        $opts = Unirest\Request::jsonOpts(true);
-        $response = new Unirest\Response(200, '{"a":1,"b":2,"c":3,"d":4,"e":5}', '', $opts);
+        $opts = Request::jsonOpts(true);
+        $response = new Response(200, '{"a":1,"b":2,"c":3,"d":4,"e":5}', '', $opts);
 
         $this->assertEquals($response->body['a'], 1);
     }
 
     public function testJSONAObjects()
     {
-        $opts = Unirest\Request::jsonOpts(false);
-        $response = new Unirest\Response(200, '{"a":1,"b":2,"c":3,"d":4,"e":5}', '', $opts);
+        $opts = Request::jsonOpts(false);
+        $response = new Response(200, '{"a":1,"b":2,"c":3,"d":4,"e":5}', '', $opts);
 
         $this->assertEquals($response->body->a, 1);
     }
 
     public function testJSONOpts()
     {
-        $opts = Unirest\Request::jsonOpts(false, 512, JSON_NUMERIC_CHECK);
-        $response = new Unirest\Response(200, '{"number": 1234567890}', '', $opts);
+        $opts = Request::jsonOpts(false, 512, JSON_NUMERIC_CHECK);
+        $response = new Response(200, '{"number": 1234567890}', '', $opts);
 
         $this->assertSame($response->body->number, 1234567890);
     }

tests/bootstrap.php

@@ -1,5 +1 @@
-<?php
-
-require_once __DIR__ . '/../src/Unirest.php';
-
-define('UPLOAD_FIXTURE', __DIR__ . '/fixtures/upload.txt');
+<?php ?>