Merged in titpetric/bitbucket-api (pull request gentlero#2)

fix and close gentlero#14 - group privileges grant

Author: vimishor

lib/Bitbucket/API/Api.php

@@ -171,13 +171,15 @@ public function requestDelete($endpoint, $params = array(), $headers = array())
      *
      * @throws \RuntimeException
      */
-    protected function doRequest($method, $endpoint, array $params, array $headers)
+    protected function doRequest($method, $endpoint, $params, array $headers)
     {
         $request    = new Request;
         $response   = new Response;
 
-        if (strtoupper($method) != 'POST') {
-            $params['format'] = $this->format;
+	$query = array("format" => $this->format);
+
+        if (strtoupper($method) != 'POST' && is_array($params)) {
+            $query = array_merge($query, $params);
         }
 
         $request->setMethod($method);
@@ -186,11 +188,9 @@ protected function doRequest($method, $endpoint, array $params, array $headers)
 
         $this->authorize($request);
 
-        if (strtoupper($method) == 'GET') {
-            $request->fromUrl(self::API_URL.'/'.urlencode($endpoint).'?'. urldecode(http_build_query($params)));
-        } else {
-            $request->fromUrl(self::API_URL.'/'.urlencode($endpoint));
-            $request->setContent(http_build_query($params));
+        $request->fromUrl(self::API_URL.'/'.urlencode($endpoint).'?'. urldecode(http_build_query($query)));
+        if (strtoupper($method) !== 'GET') {
+            $request->setContent(is_array($params) ? http_build_query($params) : $params);
         }
 
         $this->client->send($request, $response);

lib/Bitbucket/API/GroupPrivileges.php

@@ -111,7 +111,7 @@ public function grant($account, $repo, $group_owner, $group_slug, $privilege)
 
         return $this->requestPut(
             sprintf('group-privileges/%s/%s/%s/%s', $account, $repo, $group_owner, $group_slug),
-            array('privilege' => $privilege)
+            $privilege
         );
     }
 

test/Bitbucket/Tests/API/GroupPrivilegesTest.php

@@ -73,9 +73,7 @@ public function testGrantGroupPrivilegesInvalidPrivilege()
     public function testGrantGroupPrivilegesSuccess()
     {
         $endpoint       = 'group-privileges/gentle/repo/owner/sys-admins';
-        $params         = array(
-            'privilege' => 'read'
-        );
+        $params         = 'read';
 
         $privileges = $this->getApiMock('Bitbucket\API\GroupPrivileges');
         $privileges->expects($this->once())