Merge branch 'hotfix/1.1.1'

* hotfix/1.1.1:
  Fixes for working on PHP > 7.0

Author: vimishor

.travis.yml

@@ -6,6 +6,8 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - hhvm
 
 matrix:

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.1 / 2018-06-11
+
+### Fixed:
+  - Fixed `count()` issue with PHP 7.2 (issue #72)
+  - `kriswallsmith/buzz` constrained to `^0.16` from `~0.15` in order to work on PHP > 7.0 (issue #73)
+
+
 ## 1.1.0 / 2017-11-06
 
 ### Added:

composer.json

@@ -15,11 +15,11 @@
     ],
     "require": {
         "php":                  ">=5.4.0",
-        "kriswallsmith/buzz":   "~0.15",
+        "kriswallsmith/buzz":   "^0.16",
         "jacobkiers/oauth":     "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit":          "3.7.*",
+        "phpunit/phpunit":          "^4.8",
         "squizlabs/php_codesniffer": "~2.7"
     },
     "conflict": {

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.0 (https://bitbucket.org/gentlero/bitbucket-api)',
+        'user_agent'    => 'bitbucket-api-php/1.1.1 (https://bitbucket.org/gentlero/bitbucket-api)',
         'timeout'       => 10,
         'verify_peer'   => true
     );
@@ -125,8 +125,13 @@ public function request($endpoint, $params = array(), $method = 'GET', array $he
             $request->addHeaders($headers);
         }
 
-        if (count($params) > 0) {
-            $request->setContent(is_array($params) ? http_build_query($params) : $params);
+        $paramsString = null;
+        if (is_array($params) && count($params) > 0) {
+            $paramsString = http_build_query($params);
+        }
+
+        if (is_string($paramsString) && $paramsString !== null) {
+            $request->setContent($paramsString);
         }
 
         $response = is_object($this->responseObj) ? $this->responseObj : new Response();

test/Bitbucket/Tests/API/Repositories/HooksTest.php

@@ -94,6 +94,28 @@ public function testCreateSuccess()
         $hooks->create('gentle', 'eof', $params);
     }
 
+    /**
+     * @ticket 72
+     */
+    public function testCreateIssue72()
+    {
+        $params     = array(
+            'description'   => 'My first webhook',
+            'url'           => 'http://requestb.in/xxx',
+            'active'        => true,
+            'events'        => array(
+                'repo:push',
+                'issue:created',
+            )
+        );
+
+        /** @var \Bitbucket\API\Repositories\Hooks $hooks */
+        $hooks = $this->getClassMock('Bitbucket\API\Repositories\Hooks', $this->getHttpClient());
+        $response = $hooks->create('gentle', 'eof', $params);
+
+        $this->assertInstanceOf('Buzz\Message\MessageInterface', $response);
+    }
+
     public function testCreateSuccessWithExtraParameters()
     {
         $endpoint   = 'repositories/gentle/eof/hooks';