Merge branch 'release/1.1.0'

* release/1.1.0:
  Implemented Pipeline support
  Added $params arg to Repositories:all method (issue #65)

Author: vimishor

CHANGELOG.md

@@ -2,6 +2,18 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+
+## 1.1.0 / 2017-11-06
+
+### Added:
+  - Implemented [Pipeline] support. ( *thanks to @marco_veenendaal* )
+
+### Changed:
+  - Added $params arg to Repositories:all method (issue #65)
+
+[Pipeline]: https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/pipelines
+
+
 ## 1.0.0 / 2017-06-12
 
 ### Added:
@@ -14,21 +26,23 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   - Minimum required PHP version has been bumped to 5.4 from 5.3
   - SSL certificate verification is now enabled by default.
   - `Api` constructor signature was modified in order to reflect removal of transport object dependency. (_@see Removed[2]_)
-  
+
 ### Removed:
   - Removed deprecated methods from `Api` (_childFactory, processResponse, authorize_)
   - Removed transport object dependency from `Api`.
-  
+
 ### Fixed:
   - NormalizeArrayListener should not run on `FormRequest` (issue #62)
   - [Tests] Use mocked HTTP client in `OAuth2ListenerTest:testGetAccessTokenFail`
 
+
 ## 0.8.4 / 2017-05-15
 
 ### Fixed:
   - Updated broken links (_.org to .io_) inside README.md
   - Fixed broken tests on PHP 5.3 due to short array syntax.
 
+
 ## 0.8.3 / 2017-05-15
 
 ### Fixed:
@@ -40,6 +54,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed:
   - Added missing polyfill for "json_last_error_msg".
 
+
 ## 0.8.1 / 2016-05-08
 
 ### Fixed:
@@ -54,11 +69,13 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed:
   - Usage of short array syntax inside one test, forced the test suite to fail on PHP 5.3
 
+
 ## 0.7.1 / 2015-11-07
 
 ### Fixed:
   - HTTP Client options where not forwarded to child classes. (PR #26)
 
+
 ## 0.7.0 / 2015-09-08
 
 ### Added:
@@ -73,12 +90,14 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed:
   - `forking_policy` parameter renamed to `fork_policy` on repository endpoint. (issue #32)
 
+
 ## 0.6.2 / 2015-05-18
 
 ### Fixed:
   - Client listener propagation to child classes. (PR #23)
 
-##  0.6.1 / 2015-03-24
+
+## 0.6.1 / 2015-03-24
 
 ### Changed:
   - Better parameters validation and type hints.
@@ -90,6 +109,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   - `Listener::delListener` did not properly deleted the listener.
   - Forward all available listener when a child class is requested via Api::api or Api::childClass.
 
+
 ## 0.6.0 / 2014-10-21
 
 ### Added:
@@ -105,18 +125,21 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 [Fixes #22]: https://bitbucket.org/gentlero/bitbucket-api/issue/22/grant-account-privileges-to-repo
 
+
 ## 0.5.2 / 2014-07-09
 
 ### Fixed:
   - Make tests go green again. ( *My bad and I'm sorry* ).
 
+
 ## 0.5.1 / 2014-07-08
 
 ### Fixed:
   - Bug: A default content-type is added for POST and PUT, if none was given. ( [Fixes #19] )
 
 [Fixes #19]: https://bitbucket.org/gentlero/bitbucket-api/issue/19
 
+
 ## 0.5.0 / 2014-06-09
 
 ### Added:
@@ -128,13 +151,15 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed:
   - Bug: Missing content-type made `PullRequests::merge` and `PullRequests::declined` unusable.
 
+
 ## 0.4.1 / 2014-06-01
 
 ### Fixed:
   - Bug: OAuthListener: Parameters may be included from the body if the content-type is urlencoded. ( [Fixes #18] )
 
 [Fixes #18]: https://bitbucket.org/gentlero/bitbucket-api/issue/18
 
+
 ## 0.4.0 / 2014-05-14
 
 ### Added:
@@ -149,6 +174,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed:
   - Documentation updated.
 
+
 ## 0.3.0 / 2014-05-12
 
   Started to implement version 2.0 of the API.
@@ -189,6 +215,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 [Fixes #14]: https://bitbucket.org/gentlero/bitbucket-api/issue/14
 
+
 ## 0.1.2 / 2013-12-24
 
 ### 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.0.0 (https://bitbucket.org/gentlero/bitbucket-api)',
+        'user_agent'    => 'bitbucket-api-php/1.1.0 (https://bitbucket.org/gentlero/bitbucket-api)',
         'timeout'       => 10,
         'verify_peer'   => true
     );
@@ -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();
         }
 

lib/Bitbucket/API/Repositories.php

@@ -26,20 +26,21 @@ class Repositories extends Api
      * - If `$owner` is omitted, will return a list of all public repositories on Bitbucket.
      *
      * @access public
-     * @param  string $owner The account of the repo owner.
+     * @param  string           $owner  The account of the repo owner.
+     * @param  array            $params Additional parameters
      * @return MessageInterface
      *
      * @api 2.0
      * @since Method available since 0.2.0
      */
-    public function all($owner = null)
+    public function all($owner = null, array $params = array())
     {
         $endpoint = 'repositories';
 
         if (!is_null($owner)) {
             $endpoint = sprintf('repositories/%s', $owner);
         }
 
-        return $this->getClient()->setApiVersion('2.0')->get($endpoint);
+        return $this->getClient()->setApiVersion('2.0')->get($endpoint, $params);
     }
 }

lib/Bitbucket/API/Repositories/Pipelines.php

@@ -0,0 +1,111 @@
+<?php
+
+/**
+ * This file is part of the bitbucket-api package.
+ *
+ * (c) Alexandru G. <alex@gentle.ro>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Bitbucket\API\Repositories;
+
+use Bitbucket\API\Api;
+use Buzz\Message\MessageInterface;
+
+/**
+ * Manage the pipelines of a repository
+ *
+ * @author Marco Veenendaal    <marco@deinternetjongens.nl>
+ */
+class Pipelines extends Api
+{
+    /**
+     * Get the information associated with a repository's pipelines
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @return MessageInterface
+     */
+    public function all($account, $repo)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/pipelines/', $account, $repo)
+        );
+    }
+
+    /**
+     * Creates a pipeline for the specified repository.
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  array|string     $params  Additional parameters as array or JSON string
+     * @return MessageInterface
+     */
+    public function create($account, $repo, $params = array())
+    {
+        // allow developer to directly specify params as json if (s)he wants.
+        if ('array' !== gettype($params)) {
+            if (empty($params)) {
+                throw new \InvalidArgumentException('Invalid JSON provided.');
+            }
+
+            $params = $this->decodeJSON($params);
+        }
+
+        return $this->getClient()->setApiVersion('2.0')->post(
+            sprintf('repositories/%s/%s/pipelines/', $account, $repo),
+            json_encode($params),
+            array('Content-Type' => 'application/json')
+        );
+    }
+
+    /**
+     * Get a specific pipeline
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  string           $uuid    The pipeline's identifier.
+     * @return MessageInterface
+     */
+    public function get($account, $repo, $uuid)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/pipelines/%s', $account, $repo, $uuid)
+        );
+    }
+
+    /**
+     * Stop a specific pipeline
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  string           $uuid    The pipeline's identifier.
+     * @return MessageInterface
+     */
+    public function stopPipeline($account, $repo, $uuid)
+    {
+        return $this->getClient()->setApiVersion('2.0')->post(
+            sprintf('repositories/%s/%s/pipelines/%s/stopPipeline', $account, $repo, $uuid)
+        );
+    }
+
+    /**
+     * Get steps
+     *
+     * @access public
+     * @return Pipelines\Steps
+     *
+     * @throws \InvalidArgumentException
+     * @codeCoverageIgnore
+     */
+    public function steps()
+    {
+        return $this->api('Repositories\\Pipelines\\Steps');
+    }
+}

lib/Bitbucket/API/Repositories/Pipelines/Steps.php

@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * This file is part of the bitbucket-api package.
+ *
+ * (c) Alexandru G. <alex@gentle.ro>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Bitbucket\API\Repositories\Pipelines;
+
+use Bitbucket\API;
+use Buzz\Message\MessageInterface;
+
+/**
+ * Manage the steps of a pipeline.
+ *
+ * @author Marco Veenendaal    <marco@deinternetjongens.nl>
+ */
+class Steps extends API\Api
+{
+    /**
+     * Get a list of all pipeline steps
+     *
+     * @access public
+     * @param  string           $account         The team or individual account owning the repository.
+     * @param  string           $repo            The repository identifier.
+     * @param  string           $pipelineUuid    UUID of the pipeline.
+     * @return MessageInterface
+     */
+    public function all($account, $repo, $pipelineUuid)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/pipelines/%s/steps/', $account, $repo, $pipelineUuid)
+        );
+    }
+
+    /**
+     * Get an individual pipeline step
+     *
+     * @access public
+     * @param  string           $account        The team or individual account owning the repository.
+     * @param  string           $repo           The repository identifier.
+     * @param  string           $pipelineUuid   UUID of the pipeline.
+     * @param  string           $stepUuid       UUID of the step.
+     * @return MessageInterface
+     */
+    public function get($account, $repo, $pipelineUuid, $stepUuid)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/pipelines/%s/steps/%s', $account, $repo, $pipelineUuid, $stepUuid)
+        );
+    }
+
+    /**
+     * Get the log of an individual pipeline step
+     *
+     * @access public
+     * @param  string           $account        The team or individual account owning the repository.
+     * @param  string           $repo           The repository identifier.
+     * @param  string           $pipelineUuid   UUID of the pipeline.
+     * @param  string           $stepUuid       UUID of the step.
+     * @return MessageInterface
+     */
+    public function log($account, $repo, $pipelineUuid, $stepUuid)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/pipelines/%s/steps/%s/log', $account, $repo, $pipelineUuid, $stepUuid)
+        );
+    }
+}