Merge branch '2.1' into 3.0

Author: GrahamCampbell

.gitattributes

@@ -7,4 +7,5 @@
 /.gitignore export-ignore
 /phpunit.xml.dist export-ignore
 /sami.php export-ignore
+/CHANGELOG.md export-ignore
 /README.md export-ignore

CHANGELOG.md

@@ -0,0 +1,66 @@
+CHANGE LOG
+==========
+
+
+## V2.1.4 (Upcoming)
+
+* Fixed repository diffstat
+
+
+## V2.1.3 (21/05/2020)
+
+* Fixed pagination of PRs
+
+
+## V2.1.2 (12/04/2020)
+
+* Updated funding information
+
+
+## V2.1.1 (24/01/2020)
+
+* Fixes patches API
+
+
+## V2.1 (03/11/2019)
+
+* Support HTTPlug v2
+
+
+## V2.0.2 (23/08/2019)
+
+* Official PHP 7.4 support
+
+
+## V2.0.1 (30/06/2019)
+
+* Fixed naming collisions
+* Removed unused dependency
+
+
+## V2.0 (29/06/2019)
+
+* Update against latest API spec
+* Rework HTTP caching
+
+
+## V1.1.1 (29/06/2019)
+
+* Fixed HTTP exception processing edge case
+
+
+## V1.1 (05/04/2018)
+
+* Add way to set base URL
+* Fixed commit statuses
+
+
+## V1.0.1 (03/04/2018)
+
+* Present the error detail if possible too
+* Support status keys with slashes
+
+
+## V1.0 (02/04/2018)
+
+* Initial release

README.md

@@ -18,18 +18,27 @@ This is strongly based on [php-github-api](https://github.com/KnpLabs/php-github
 * [GitLab](https://gitlab.com/) - [m4tthumphrey/php-gitlab-api](https://packagist.org/packages/m4tthumphrey/php-gitlab-api) by [Matt Humphrey](https://github.com/m4tthumphrey) et al.
 * [Bitbucket](https://bitbucket.org/) - [bitbucket/client](https://packagist.org/packages/bitbucket/client) which is this package!
 
+Feel free to check out the [change log](CHANGELOG.md), [releases](https://github.com/BitbucketAPI/Client/releases), [security policy](https://github.com/BitbucketAPI/Client/security/policy), [license](LICENSE), [code of conduct](.github/CODE_OF_CONDUCT.md), and [contribution guidelines](.github/CONTRIBUTING.md).
+
 
 ## Installation
 
 This version requires [PHP](https://php.net) 7.2-7.4.
 
-To get the latest version, simply require the project using [Composer](https://getcomposer.org). You will need to install any package that "provides" `php-http/client-implementation`. Most users will want:
+To get the latest version, simply require the project using [Composer](https://getcomposer.org). You will need to install any package that "provides" `php-http/client-implementation`. Pure PHP users will want something like:
 
 ```bash
 $ composer require bitbucket/client php-http/guzzle6-adapter:^2.0
 ```
 
-There is also a Laravel bridge for this package: [`graham-campbell/bitbucket`](https://github.com/GrahamCampbell/Laravel-Bitbucket).
+Laravel users will want something like:
+
+```bash
+$ composer require graham-campbell/bitbucket php-http/guzzle6-adapter:^2.0
+```
+
+We are decoupled from any HTTP messaging client with help by [HTTPlug](http://httplug.io). You can visit [HTTPlug for library users](https://docs.php-http.org/en/latest/httplug/users.html) to get more information about installing HTTPlug related packages. [`graham-campbell/bitbucket`](https://github.com/GrahamCampbell/Laravel-Bitbucket) is by [Graham Campbell](https://github.com/GrahamCampbell)
+
 
 ## Usage
 

composer.json

@@ -38,11 +38,6 @@
     "config": {
         "preferred-install": "dist"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
-    },
     "minimum-stability": "dev",
     "prefer-stable": true
 }

src/Api/Repositories/Users.php

@@ -22,7 +22,7 @@
 use Bitbucket\Api\Repositories\Users\DeployKeys;
 use Bitbucket\Api\Repositories\Users\Deployments;
 use Bitbucket\Api\Repositories\Users\Diffs;
-use Bitbucket\Api\Repositories\Users\DiffStats;
+use Bitbucket\Api\Repositories\Users\DiffStat;
 use Bitbucket\Api\Repositories\Users\Downloads;
 use Bitbucket\Api\Repositories\Users\Environments;
 use Bitbucket\Api\Repositories\Users\FileHistory;
@@ -214,11 +214,11 @@ public function diffs(string $repo)
     /**
      * @param string $repo
      *
-     * @return \Bitbucket\Api\Repositories\Users\DiffStats
+     * @return \Bitbucket\Api\Repositories\Users\DiffStat
      */
-    public function diffStats(string $repo)
+    public function diffStat(string $repo)
     {
-        return new DiffStats($this->getHttpClient(), $this->username, $repo);
+        return new DiffStat($this->getHttpClient(), $this->username, $repo);
     }
 
     /**

src/Api/Repositories/Users/DiffStats.php renamed to src/Api/Repositories/Users/DiffStat.php

@@ -14,11 +14,11 @@
 namespace Bitbucket\Api\Repositories\Users;
 
 /**
- * The diffs stats api class.
+ * The diffs stat api class.
  *
  * @author Graham Campbell <[email protected]>
  */
-class DiffStats extends AbstractUsersApi
+class DiffStat extends AbstractUsersApi
 {
     /**
      * @param string $spec
@@ -30,22 +30,22 @@ class DiffStats extends AbstractUsersApi
      */
     public function download(string $spec, array $params = [])
     {
-        $path = $this->buildDiffStatssPath($spec);
+        $path = $this->buildDiffStatPath($spec);
 
         return $this->get($path, $params);
     }
 
     /**
-     * Build the diff stats path from the given parts.
+     * Build the diff stat path from the given parts.
      *
      * @param string[] $parts
      *
      * @throws \Bitbucket\Exception\InvalidArgumentException
      *
      * @return string
      */
-    protected function buildDiffStatssPath(string ...$parts)
+    protected function buildDiffStatPath(string ...$parts)
     {
-        return static::buildPath('repositories', $this->username, $this->repo, 'diffstats', ...$parts);
+        return static::buildPath('repositories', $this->username, $this->repo, 'diffstat', ...$parts);
     }
 }