From d2c5479b2d298f4aa60b5b7006247eed191ac946 Mon Sep 17 00:00:00 2001 From: Paul Wenke Date: Sun, 6 Mar 2016 22:20:22 -0500 Subject: [PATCH] Updated documentation and fixed formatting in Bitbucket Util. --- doc/03-cli.md | 2 +- doc/06-config.md | 6 ++++++ src/Composer/Util/Bitbucket.php | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/03-cli.md b/doc/03-cli.md index 8f621d11a..c56fd35b7 100644 --- a/doc/03-cli.md +++ b/doc/03-cli.md @@ -778,7 +778,7 @@ file to be used during SSL/TLS peer verification. The `COMPOSER_AUTH` var allows you to set up authentication as an environment variable. The contents of the variable should be a JSON formatted object containing http-basic, -github-oauth, ... objects as needed, and following the +github-oauth, bitbucket-oauth, ... objects as needed, and following the [spec from the config](06-config.md#gitlab-oauth). ### COMPOSER_DISCARD_CHANGES diff --git a/doc/06-config.md b/doc/06-config.md index 0dfd50bd0..fe4be2b76 100644 --- a/doc/06-config.md +++ b/doc/06-config.md @@ -81,6 +81,12 @@ downloaded via Composer. If you really absolutely need HTTP access to something then you can disable it, but using [Let's Encrypt](https://letsencrypt.org/) to get a free SSL certificate is generally a better alternative. +## bitbucket-oauth + +A list of domain names and consumers. For example using `{"bitbucket.org": +{"consumer-key": "myKey", "consumer-secret": "mySecret"}}`. [Read](https://confluence.atlassian.com/bitbucket/oauth-on-bitbucket-cloud-238027431.html) +how to set up a consumer on Bitbucket. + ## cafile Location of Certificate Authority file on local filesystem. In PHP 5.6+ you diff --git a/src/Composer/Util/Bitbucket.php b/src/Composer/Util/Bitbucket.php index 153a61285..e27bd7439 100644 --- a/src/Composer/Util/Bitbucket.php +++ b/src/Composer/Util/Bitbucket.php @@ -91,7 +91,7 @@ class Bitbucket } catch (TransportException $e) { if (in_array($e->getCode(), array(403, 401))) { $this->io->writeError('Invalid consumer provided.'); - $this->io->writeError('You can also add it manually later by using "composer config bitbucket-oauth.bitbucket.org "'); + $this->io->writeError('You can also add it manually later by using "composer config bitbucket-oauth.bitbucket.org "'); return false; }