Merge branch 'bug/issue-64' into develop

* bug/issue-64:
  [Bug] Include format param only in API v1

Author: vimishor

lib/Bitbucket/API/Http/Client.php

@@ -268,7 +268,7 @@ protected function createRequest($method, $url)
         }
 
         // change the response format
-        if (strpos($url, 'format=') === false) {
+        if ($this->getApiVersion() === '1.0' && strpos($url, 'format=') === false) {
             $url .= (strpos($url, '?') === false ? '?' : '&').'format='.$this->getResponseFormat();
         }
 

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

@@ -207,6 +207,33 @@ public function testCurrentApiVersion()
         $this->assertTrue($client->isApiVersion('2'));
     }
 
+    /**
+     * @ticket 64
+     */
+    public function testIncludeFormatParamOnlyInV1()
+    {
+        $endpoint = sprintf(
+            'repositories/gentlero/bitbucket-api/src/%s/%s',
+            'develop',
+            'lib/Bitbucket/API/Repositories'
+        );
+        $params = $headers = [];
+
+        $baseClient = $this->getBrowserMock();
+        $client     = new Client(['api_version' => '2.0'], $baseClient);
+        $client->get($endpoint, $params, $headers);
+
+        /** @noinspection PhpUndefinedMethodInspection */
+        $req    = $client->getLastRequest()->getResource();
+        $parts  = parse_url($req);
+
+        if (false === array_key_exists('query', $parts)) {
+            $parts['query'] = '';
+        }
+
+        $this->assertFalse(strpos($parts['query'], 'format'));
+    }
+
     private function getListenerMock($name = 'dummy')
     {
         $listener = $this->getMock('Bitbucket\API\Http\Listener\ListenerInterface');