Merge branch 'hotfix/1.1.2'

* hotfix/1.1.2:
  Request content was not set when a json was provided

Author: vimishor

CHANGELOG.md

@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## 1.1.2 / 2018-06-18
+
+### Fixed:
+  - Request content was not set when a json was provided (issue #74)
+
+
+
 ## 1.1.1 / 2018-06-11
 
 ### Fixed:

lib/Bitbucket/API/Http/Client.php

@@ -32,7 +32,7 @@ class Client extends ClientListener implements ClientInterface
         'api_versions'  => array('1.0', '2.0'),     // supported versions
         'format'        => 'json',
         'formats'       => array('json', 'xml'),    // supported response formats
-        'user_agent'    => 'bitbucket-api-php/1.1.1 (https://bitbucket.org/gentlero/bitbucket-api)',
+        'user_agent'    => 'bitbucket-api-php/1.1.2 (https://bitbucket.org/gentlero/bitbucket-api)',
         'timeout'       => 10,
         'verify_peer'   => true
     );
@@ -134,6 +134,10 @@ public function request($endpoint, $params = array(), $method = 'GET', array $he
             $request->setContent($paramsString);
         }
 
+        if (is_string($params) && $params !== null) {
+            $request->setContent($params);
+        }
+
         $response = is_object($this->responseObj) ? $this->responseObj : new Response();
 
         $this->executeListeners($request, 'preSend');

test/Bitbucket/Tests/API/Http/ClientTest.php

@@ -101,6 +101,26 @@ public function testShouldDoPostRequestWithContentAndReturnResponseInstance()
         );
     }
 
+    /**
+     * @ticket 74
+     */
+    public function testShouldDoPostRequestWithJsonContentAndReturnResponseInstance()
+    {
+        $endpoint   = 'repositories/gentle/eof/pullrequests';
+        $params     = json_encode(array('1' => '2', 'name' => 'john'));
+        $headers    = array('Content-Type' => 'application/json');
+        $baseClient = $this->getBrowserMock();
+        $client     = new Client(array('user_agent' => 'tests'), $baseClient);
+        $response   = $client->post($endpoint, $params, $headers);
+
+        $this->assertInstanceOf('\Buzz\Message\MessageInterface', $response);
+        $this->assertEquals($params, $client->getLastRequest()->getContent());
+        $this->assertEquals(
+            array('User-Agent: tests', 'Content-Type: application/json'),
+            $client->getLastRequest()->getHeaders()
+        );
+    }
+
     public function testShouldDoPutRequestAndReturnResponseInstance()
     {
         $endpoint   = 'repositories/gentle/eof/issues/3';