Merge branch 'release/1.1.2.0'

Author: romannebesnuy

.gitignore

@@ -2,3 +2,4 @@ vendor/
 report/
 build/
 composer.lock
+.idea/

.travis.yml

@@ -8,7 +8,6 @@ php:
   - 7.0
   - 7.1
   - 7.2
-  - hhvm
 
 matrix:
   fast_finish: true

CHANGELOG.md

@@ -3,13 +3,22 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 
+## [Unreleased]
+
+### Added:
+  - Create a file through API via `Src:create` (PR #40)
+
+### Changed:
+  - Updated `Api:api` in order to support class name resolution via `::class` (PR #38)
+  - Updated `BranchRestrictions` with newly available restriction types (PR #39)
+
+
 ## 1.1.2 / 2018-06-18
 
 ### Fixed:
   - Request content was not set when a json was provided (issue #74)
 
 
-
 ## 1.1.1 / 2018-06-11
 
 ### Fixed:

docs/examples/repositories/refs/branches.md

@@ -23,6 +23,12 @@ $branches->all($account_name, $repo_slug);
 $branches->get($account_name, $repo_slug, $branch_name);
 ```
 
+### Delete an individual branch:
+
+```php
+$branches->delete($account_name, $repo_slug, $branch_name);
+```
+
 ----
 
 #### Related:

docs/examples/repositories/src.md

@@ -6,8 +6,7 @@ title: Source
 
 # Source
 
-Allows you to browse directories and view files.
-*NOTE:* This is a read-only resource.
+Allows you to browse directories and view files, create branches and commit new files.
 
 ### Prepare:
 {% include auth.md var_name="src" class_ns="Repositories\Src" %}
@@ -21,9 +20,44 @@ $src->get($account_name, $repo_slug, '1e10ffe', 'app/models/');
 ### Get raw content of an individual file:
 
 ```php
-$src->raw($account_name, $repo_slug, '1e10ffe', 'app/models/core.php');
+$src->get($account_name, $repo_slug, '1e10ffe', 'app/models/core.php');
 ```
 
+### Create file in repository
+
+```php
+$params = array();
+$params['parent'] = 'master'; // Optional branch to commit to
+$params['/path-to-file'] = 'File content'; // Can be multiple files per commit
+$params['author'] = 'User <my@email.com>';
+$params['message'] = 'Commit message';
+
+$src->create($account_name, $repo_slug, $params);
+```
+
+### Delete file in repository
+
+```php
+$params = array();
+$params['parent'] = 'master'; // Optional branch to commit to
+$params['files'] = '/file-to-delete';
+$params['author'] = 'User <my@email.com>';
+$params['message'] = 'Commit message';
+
+$src->create($account_name, $repo_slug, $params);
+```
+
+### Create new branch in repository
+
+```php
+$params = array();
+$params['parent'] = 'master'; // Optional source branch
+$params['branch'] = 'new-branch-name';
+$params['author'] = 'User <my@email.com>';
+$params['message'] = 'Commit message';
+
+$src->create($account_name, $repo_slug, $params);
+```
 ----
 
 #### Related:

lib/Bitbucket/API/Api.php

@@ -207,11 +207,15 @@ public function api($name)
             throw new \InvalidArgumentException('No child specified.');
         }
 
-        /** @var Api $child */
-        $class = '\\Bitbucket\\API\\'.$name;
+        if (class_exists($name)) {
+            $class = $name;
+        } else {
+            /** @var Api $child */
+            $class = '\\Bitbucket\\API\\'.$name;
 
-        if (!class_exists($class)) {
-            throw new \InvalidArgumentException(sprintf('No such child class [%s].', $name));
+            if (!class_exists($class)) {
+                throw new \InvalidArgumentException(sprintf('No such child class [%s].', $name));
+            }
         }
 
         $child = new $class();

lib/Bitbucket/API/Http/Client.php

@@ -81,6 +81,8 @@ public function get($endpoint, $params = array(), $headers = array())
             $params     = array();
         }
 
+        $endpoint = str_replace('~=', '~', urldecode($endpoint));
+
         return $this->request($endpoint, $params, 'GET', $headers);
     }
 

lib/Bitbucket/API/Repositories/BranchRestrictions.php

@@ -21,6 +21,23 @@
  */
 class BranchRestrictions extends Api
 {
+    /**
+     * Allowed restrictions to create a new branch permission for
+     * @var array
+     */
+    protected $allowedRestrictionTypes = array(
+        'require_tasks_to_be_completed',
+        'require_passing_builds_to_merge',
+        'force',
+        'require_all_dependencies_merged',
+        'push',
+        'require_approvals_to_merge',
+        'enforce_merge_checks',
+        'restrict_merges',
+        'reset_pullrequest_approvals_on_change',
+        'delete'
+    );
+
     /**
      * Get the information associated with a repository's branch restrictions
      *
@@ -64,7 +81,7 @@ public function create($account, $repo, $params = array())
 
         $params = array_merge($defaults, $params);
 
-        if (empty($params['kind']) || !in_array($params['kind'], array('push', 'delete', 'force','restrict_merges'))) {
+        if (empty($params['kind']) || !in_array($params['kind'], $this->allowedRestrictionTypes)) {
             throw new \InvalidArgumentException('Invalid restriction kind.');
         }
 
@@ -142,4 +159,14 @@ public function delete($account, $repo, $id)
             sprintf('repositories/%s/%s/branch-restrictions/%d', $account, $repo, $id)
         );
     }
+
+    /**
+     * Add allowed permission types
+     *
+     * @param array $restrictions
+     */
+    public function addAllowedRestrictionType($restrictions = array())
+    {
+        $this->allowedRestrictionTypes = array_merge($this->allowedRestrictionTypes, $restrictions);
+    }
 }

lib/Bitbucket/API/Repositories/PullRequests/Comments.php

@@ -66,9 +66,10 @@ public function get($account, $repo, $requestID, $commentID)
      */
     public function create($account, $repo, $requestID, $content)
     {
-        return $this->requestPost(
+        return $this->getClient()->setApiVersion('2.0')->post(
             sprintf('repositories/%s/%s/pullrequests/%d/comments', $account, $repo, $requestID),
-            array('content' => $content)
+            json_encode(array('content' => array('raw' => $content))),
+            array('Content-Type' => 'application/json')
         );
     }
 
@@ -85,9 +86,10 @@ public function create($account, $repo, $requestID, $content)
      */
     public function update($account, $repo, $requestID, $commentID, $content)
     {
-        return $this->requestPut(
+        return $this->getClient()->setApiVersion('2.0')->put(
             sprintf('repositories/%s/%s/pullrequests/%d/comments/%d', $account, $repo, $requestID, $commentID),
-            array('content' => $content)
+            json_encode(array('content' => array('raw' => $content))),
+            array('Content-Type' => 'application/json')
         );
     }
 
@@ -103,7 +105,7 @@ public function update($account, $repo, $requestID, $commentID, $content)
      */
     public function delete($account, $repo, $requestID, $commentID)
     {
-        return $this->requestDelete(
+        return $this->getClient()->setApiVersion('2.0')->delete(
             sprintf('repositories/%s/%s/pullrequests/%d/comments/%d', $account, $repo, $requestID, $commentID)
         );
     }

lib/Bitbucket/API/Repositories/Refs.php

@@ -0,0 +1,38 @@
+<?php
+/**
+ * This file is part of the bitbucket-api package.
+ *
+ * (c) Alexandru Guzinschi <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;
+use Buzz\Message\MessageInterface;
+
+/**
+ * @author  Kevin Howe    <kjhowe@gmail.com>
+ */
+class Refs extends API\Api
+{
+    /**
+     * Get a list of refs
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  string|array     $params  GET parameters
+     * @return MessageInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function all($account, $repo, array $params = array())
+    {
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/refs', $account, $repo),
+            $params
+        );
+    }
+}

lib/Bitbucket/API/Repositories/Refs/Branches.php

@@ -53,4 +53,22 @@ public function get($account, $repo, $name)
             sprintf('repositories/%s/%s/refs/branches/%s', $account, $repo, $name)
         );
     }
+
+    /**
+     * Deletes an individual branch
+     *
+     * @access public
+     * @param  string           $account The team or individual account owning the repository.
+     * @param  string           $repo    The repository identifier.
+     * @param  string           $name    The branch identifier.
+     * @return MessageInterface
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function delete($account, $repo, $name)
+    {
+        return $this->getClient()->setApiVersion('2.0')->delete(
+            sprintf('repositories/%s/%s/refs/branches/%s', $account, $repo, $name)
+        );
+    }
 }

lib/Bitbucket/API/Repositories/Repository.php

@@ -196,9 +196,12 @@ public function fork($account, $repo, $name, array $params = array())
     {
         $params['name'] = $name;
 
-        return $this->requestPost(
-            sprintf('repositories/%s/%s/fork', $account, $repo),
-            $params
+        $params = json_encode($params);
+
+        return $this->getClient()->setApiVersion('2.0')->post(
+            sprintf('repositories/%s/%s/forks', $account, $repo),
+            $params,
+            array('Content-Type' => 'application/json')
         );
     }
 
@@ -249,17 +252,18 @@ public function manifest($account, $repo, $revision)
     }
 
     /**
-     * Get a list of tags
+     * Get a pagination list of tags or tag object by name
      *
      * @access public
      * @param  string           $account The team or individual account owning the repository.
      * @param  string           $repo    The repository identifier.
+     * @param  string           $name    The name of the tag
      * @return MessageInterface
      */
-    public function tags($account, $repo)
+    public function tags($account, $repo, $name = '')
     {
-        return $this->requestGet(
-            sprintf('repositories/%s/%s/tags', $account, $repo)
+        return $this->getClient()->setApiVersion('2.0')->get(
+            sprintf('repositories/%s/%s/refs/tags/%s', $account, $repo, $name)
         );
     }
 

lib/Bitbucket/API/Repositories/Src.php

@@ -24,7 +24,7 @@
 class Src extends API\Api
 {
     /**
-     * Get a list of repo source
+     * Get raw content of an individual file, or the contents of a directory
      *
      * @access public
      * @param  string           $account  The team or individual account owning the repository.
@@ -35,25 +35,38 @@ class Src extends API\Api
      */
     public function get($account, $repo, $revision, $path)
     {
-        return $this->requestGet(
+        return $this->getClient()->setApiVersion("2.0")->get(
             sprintf('repositories/%s/%s/src/%s/%s', $account, $repo, $revision, $path)
         );
     }
 
     /**
-     * Get raw content of an individual file
-     *
-     * @access public
-     * @param  string           $account  The team or individual account owning the repository.
-     * @param  string           $repo     The repository identifier.
-     * @param  string           $revision A value representing the revision or branch to list.
-     * @param  string           $path     The path can be a filename or a directory path.
+     * Create file in repository
+     *      $params contains the files to create, the key is the file (with path) to create and the value is the
+     *      data that will be written to the file.
+     *      See https://developer.atlassian.com/bitbucket/api/2/reference/resource/repositories/%7Busername%7D/%7Brepo_slug%7D/src#post
+     *      for details on what options are available
+     * @param $account
+     * @param $repo
+     * @param array $params
      * @return MessageInterface
      */
-    public function raw($account, $repo, $revision, $path)
+    public function create($account, $repo, array $params = array())
     {
-        return $this->requestGet(
-            sprintf('repositories/%s/%s/raw/%s/%s', $account, $repo, $revision, $path)
+        $mandatory = array(
+            'author'   => '',
+            'message'  => '',
+        );
+
+        $diff = array_diff(array_keys($mandatory), array_keys($params));
+
+        if (count($diff) > 0) {
+            throw new \InvalidArgumentException('Missing parameters for creating new files.');
+        }
+
+        return $this->getClient()->setApiVersion('2.0')->post(
+            sprintf('repositories/%s/%s/src', $account, $repo),
+            $params
         );
     }
 }