Merge branch 'release/0.4.0'

Author: vimishor

docs/Home.md

@@ -11,7 +11,9 @@ A simple PHP wrapper for Bitbucket API.
 * [Invitations](invitations.md)
 * [Privileges](privileges.md)
 * [Repositories](repositories.md) (API 2.0)
+    * [Branch Restrictions](repositories/branch-restrictions.md) (API 2.0)
     * [Changesets](repositories/changesets.md)
+    * [Commit(s)](repositories/commits.md) (API 2.0)
     * [Deploykeys](repositories/deploykeys.md)
     * [Events](repositories/events.md)
     * [Followers](repositories/followers.md)
@@ -22,9 +24,10 @@ A simple PHP wrapper for Bitbucket API.
     * [Services](repositories/services.md)
     * [Src](repositories/src.md)
     * [Wiki](repositories/wiki.md)
+* [Teams](teams.md) (API 2.0)
 * [User](user.md)
     * [Repositories](user/repositories.md)
-* [Users](users.md)
+* [Users](users.md) (API 2.0)
     * [Account](users/account.md)
     * [Emails](users/emails.md)
     * [Invitations](users/invitations.md)

docs/repositories/branch-restrictions.md

@@ -0,0 +1,56 @@
+## Branch restrictions
+
+----
+Manage branch restrictions on a repository
+
+### Prepare:
+```php
+$restrictions = new Bitbucket\API\Repositories\PullRequests();
+$restrictions->setCredentials( new Bitbucket\API\Authentication\Basic($bb_user, $bb_pass) );
+```
+
+### Get the information associated with a repository's branch restrictions: (API 2.0)
+```php
+$restrictions->all($account_name, $repo_slug);
+```
+
+### Creates restrictions: (API 2.0)
+
+Restrict push access to any branches starting with `joe-and-mary-` only to users `joe` and `mary`:
+```php
+$restrictions->create($account_name, $repo_slug, array(
+    'kind'      => 'push',
+    'pattern'   => 'joe-and-mary-*',
+    'users'     => array(
+        array('username' => 'joe'),
+        array('username' => 'mary')
+    )
+));
+```
+
+### Get a specific restriction: (API 2.0)
+```php
+$restrictions->get($account_name, $repo_slug, $restrictionID);
+```
+
+### Update a specific restriction: (API 2.0)
+```php
+$restrictions->update($account_name, $repo_slug, $restrictionID, array(
+    'users' => array(
+        array('username' => 'joe'),
+        array('username' => 'mary'),
+        array('username' => 'joe-work')
+    )
+));
+```
+
+### Delete a specific restriction: (API 2.0)
+```php
+$restrictions->delete($account_name, $repo_slug, $restrictionID);
+```
+
+----
+
+#### Related:
+  * [Authentication](../authentication.md)
+  * [BB Wiki](https://confluence.atlassian.com/x/XQEYFw)

docs/repositories/pullrequests.md

@@ -19,6 +19,11 @@ $pull->all($account_name, $repo_slug);
 $pull->all($account_name, $repo_slug, array('state' => 'merged'));
 ```
 
+### Get all merged and declined pull requests: (API 2.0)
+```php
+$pull->all($account_name, $repo_slug, array('state' => array('merged', 'declined')));
+```
+
 ### Create a new pull request: (API 2.0)
 ```php
 $pull->create('gentle', 'secret-repo', array(

docs/teams.md

@@ -0,0 +1,42 @@
+## Teams
+
+----
+Get Team related information.
+
+### Prepare:
+```php
+$team = new Bitbucket\API\Teams();
+$team->setCredentials( new Bitbucket\API\Authentication\Basic($bb_user, $bb_pass) );
+```
+
+### Get the team profile: (API 2.0)
+```php
+$team->profile($team_name);
+```
+
+### Get the team members: (API 2.0)
+```php
+$team->members($team_name);
+```
+
+### Get the team followers: (API 2.0)
+```php
+$team->followers($team_name);
+```
+
+### Get a list of accounts the team is following: (API 2.0)
+```php
+$team->following($team_name);
+```
+
+### Get the team's repositories: (API 2.0)
+```php
+$team->repositories($team_name);
+```
+
+
+----
+
+#### Related:
+  * [Authentication](authentication.md)
+  * [BB Wiki](https://confluence.atlassian.com/x/XwZAGQ)

docs/users.md

@@ -5,8 +5,28 @@ Get information related to an individual or team account.
 
 ### Prepare:
 ```php
-$users = new Bitbucket\API\Users();
-$users->setCredentials( new Bitbucket\API\Authentication\Basic($bb_user, $bb_pass) );
+$user = new Bitbucket\API\Users();
+$user->setCredentials( new Bitbucket\API\Authentication\Basic($bb_user, $bb_pass) );
+```
+
+### Get the public information associated with a user: (API 2.0)
+```php
+$user->get($username);
+```
+
+### Get the list of followers: (API 2.0)
+```php
+$user->followers($username);
+```
+
+### Get a list of accounts the user is following: (API 2.0)
+```php
+$user->following($username);
+```
+
+### Get the list of the user's repositories: (API 2.0)
+```php
+$user->repositories($username);
 ```
 
 ----

lib/Bitbucket/API/Api.php

@@ -298,4 +298,24 @@ protected function childFactory($name)
 
         return $child;
     }
+
+    /**
+     * Convert JSON to array with error check
+     *
+     * @access protected
+     * @param  string $body JSON data
+     * @return array
+     *
+     * @throws \InvalidArgumentException
+     */
+    protected function decodeJSON($body)
+    {
+        $params = json_decode($body, true);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw new \InvalidArgumentException('Invalid JSON data provided.');
+        }
+
+        return $params;
+    }
 }

lib/Bitbucket/API/Http/Client.php

@@ -33,7 +33,7 @@ class Client 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/0.3.0 (https://bitbucket.org/gentlero/bitbucket-api)',
+        'user_agent'    => 'bitbucket-api-php/0.4.0 (https://bitbucket.org/gentlero/bitbucket-api)',
         'timeout'       => 10,
         'verify_peer'   => false
     );
@@ -77,6 +77,22 @@ public function addListener(ListenerInterface $listener)
         return $this;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function delListener($name)
+    {
+        if ($name instanceof ListenerInterface) {
+            $name = $name->getName();
+        }
+
+        if ($this->isListener($name) === true) {
+            unset($this->listeners[$name]);
+        }
+
+        return $this;
+    }
+
     /**
      * {@inheritDoc}
      */

lib/Bitbucket/API/Http/ClientInterface.php

@@ -132,6 +132,13 @@ public function getApiBaseUrl();
      */
     public function addListener(ListenerInterface $listener);
 
+    /**
+     * @access public
+     * @param  ListenerInterface|string $name
+     * @return $this
+     */
+    public function delListener($name);
+
     /**
      * Get listener interface
      *

lib/Bitbucket/API/Http/Listener/RequestListener.php

@@ -36,6 +36,11 @@ public function preSend(RequestInterface $request)
             // Transform: "foo[0]=xxx&foo[1]=yyy" to "foo=xxx&foo=yyy"
             preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $request->getContent())
         );
+
+        $request->setResource(
+            // Transform: "foo[0]=xxx&foo[1]=yyy" to "foo=xxx&foo=yyy"
+            preg_replace('/%5B(?:[0-9]|[1-9][0-9]+)%5D=/', '=', $request->getResource())
+        );
     }
 
     /**

lib/Bitbucket/API/Repositories/BranchRestrictions.php

@@ -0,0 +1,140 @@
+<?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 branch restrictions on a repository
+ *
+ * @author  Alexandru G.    <alex@gentle.ro>
+ */
+class BranchRestrictions extends Api
+{
+    /**
+     * Get the information associated with a repository's branch restrictions
+     *
+     * @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/branch-restrictions', $account, $repo)
+        );
+    }
+
+    /**
+     * Creates restrictions 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            $params  Additional parameters
+     * @return MessageInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function create($account, $repo, $params = array())
+    {
+        // allow developer to directly specify params as json if (s)he wants.
+        if (!empty($params) && is_string($params)) {
+            $params = $this->decodeJSON($params);
+        }
+
+        if (!empty($params) && is_array($params)) {
+            $params = array_merge(
+                array(
+                    'kind' => 'push'
+                ),
+                $params
+            );
+        }
+
+        if (empty($params['kind']) or !in_array($params['kind'], array('push', 'delete', 'force'))) {
+            throw new \InvalidArgumentException('Invalid restriction kind.');
+        }
+
+        return $this->getClient()->setApiVersion('2.0')->post(
+            sprintf('repositories/%s/%s/branch-restrictions', $account, $repo),
+            json_encode($params),
+            array('Content-Type' => 'application/json')
+        );
+    }
+
+    /**
+     * Get a specific restriction
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  int              $id      The restriction's identifier.
+     * @return MessageInterface
+     */
+    public function get($account, $repo, $id)
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/branch-restrictions/%d', $account, $repo, $id)
+        );
+    }
+
+    /**
+     * Updates a specific branch restriction.
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  int              $id      The restriction's identifier.
+     * @param  array            $params  Additional parameters
+     * @return MessageInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function update($account, $repo, $id, $params = array())
+    {
+        // allow developer to directly specify params as json if (s)he wants.
+        if (!empty($params) && is_string($params)) {
+            $params = $this->decodeJSON($params);
+        }
+
+        if (!empty($params['kind'])) {
+            throw new \InvalidArgumentException('You cannot change the "kind" value.');
+        }
+
+        return $this->getClient()->setApiVersion('2.0')->put(
+            sprintf('repositories/%s/%s/branch-restrictions/%d', $account, $repo, $id),
+            json_encode($params),
+            array('Content-Type' => 'application/json')
+        );
+    }
+
+    /**
+     * Delete a specific branch restriction.
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  int              $id      The restriction's identifier.
+     * @return MessageInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function delete($account, $repo, $id)
+    {
+        return $this->getClient()->setApiVersion('2.0')->delete(
+            sprintf('repositories/%s/%s/branch-restrictions/%d', $account, $repo, $id)
+        );
+    }
+}