public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Updated documentation and fixed formatting in Bitbucket Util.

pull/5055/head
Paul Wenke 2016-03-06 22:20:22 -05:00
parent d5332a1b5c
commit d2c5479b2d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/03-cli.md
View File

@ -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 `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, 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). [spec from the config](06-config.md#gitlab-oauth).
### COMPOSER_DISCARD_CHANGES ### COMPOSER_DISCARD_CHANGES

6
doc/06-config.md
View File

@ -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 then you can disable it, but using [Let's Encrypt](https://letsencrypt.org/) to
get a free SSL certificate is generally a better alternative. 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 ## cafile
Location of Certificate Authority file on local filesystem. In PHP 5.6+ you Location of Certificate Authority file on local filesystem. In PHP 5.6+ you

2
src/Composer/Util/Bitbucket.php
View File

@ -91,7 +91,7 @@ class Bitbucket
} catch (TransportException $e) { } catch (TransportException $e) {
if (in_array($e->getCode(), array(403, 401))) { if (in_array($e->getCode(), array(403, 401))) {
$this->io->writeError('<error>Invalid consumer provided.</error>'); $this->io->writeError('<error>Invalid consumer provided.</error>');
$this->io->writeError('You can also add it manually later by using "composer config bitbucket-oauth.bitbucket.org <consumerKey> <consumerSecret>"'); $this->io->writeError('You can also add it manually later by using "composer config bitbucket-oauth.bitbucket.org <consumer-key> <consumer-secret>"');
return false; return false;
} }