Fixed path construction

Author: GrahamCampbell

src/Api/AbstractApi.php

@@ -122,7 +122,7 @@ protected function pureGet(string $path, array $params = [], array $headers = []
             $path .= '?'.http_build_query($params);
         }
 
-        return $this->client->get($path, $headers);
+        return $this->client->get(self::computePath($path), $headers);
     }
 
     /**
@@ -160,7 +160,7 @@ protected function post(string $path, array $params = [], array $headers = [])
      */
     protected function postRaw(string $path, $body = null, array $headers = [])
     {
-        $response = $this->client->post($path, $headers, $body);
+        $response = $this->client->post(self::computePath($path), $headers, $body);
 
         return ResponseMediator::getContent($response);
     }
@@ -200,7 +200,7 @@ protected function put(string $path, array $params = [], array $headers = [])
      */
     protected function putRaw(string $path, $body = null, array $headers = [])
     {
-        $response = $this->client->put($path, $headers, $body);
+        $response = $this->client->put(self::computePath($path), $headers, $body);
 
         return ResponseMediator::getContent($response);
     }
@@ -240,7 +240,7 @@ protected function delete(string $path, array $params = [], array $headers = [])
      */
     protected function deleteRaw(string $path, $body = null, array $headers = [])
     {
-        $response = $this->client->delete($path, $headers, $body);
+        $response = $this->client->delete(self::computePath($path), $headers, $body);
 
         return ResponseMediator::getContent($response);
     }
@@ -267,6 +267,18 @@ protected static function buildPath(string ...$parts)
         return implode('/', $parts);
     }
 
+    /**
+     * Compute the prefixed API path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    private static function computePath(string $path)
+    {
+        return sprintf('/2.0/%s', $path);
+    }
+
     /**
      * Create a JSON encoded version of an array of params.
      *

src/Client.php

@@ -81,7 +81,7 @@ public function __construct(Builder $httpClientBuilder = null)
         $builder->addPlugin(new ExceptionThrower());
         $builder->addPlugin(new HistoryPlugin($this->responseHistory));
         $builder->addPlugin(new RedirectPlugin());
-        $builder->addPlugin(new AddHostPlugin(UriFactoryDiscovery::find()->createUri('https://api.bitbucket.org/2.0')));
+        $builder->addPlugin(new AddHostPlugin(UriFactoryDiscovery::find()->createUri('https://api.bitbucket.org')));
         $builder->addPlugin(new HeaderDefaultsPlugin(['User-Agent' => 'bitbucket-api-client/1.0']));
 
         $builder->addHeaderValue('Accept', 'application/json');