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

Merge branch '1.4'

pull/6297/head
Jordi Boggiano 2017-03-24 09:35:16 +01:00
parent 4a6013d0f4 d20494ddf6
commit 00a6b7c794
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.lock generated
View File

@ -303,16 +303,16 @@
}, },
{ {
"name": "seld/cli-prompt", "name": "seld/cli-prompt",
"version": "1.0.2", "version": "1.0.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/cli-prompt.git", "url": "https://github.com/Seldaek/cli-prompt.git",
"reference": "8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4" "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4", "url": "https://api.github.com/repos/Seldaek/cli-prompt/zipball/a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
"reference": "8cbe10923cae5bcd7c5a713f6703fc4727c8c1b4", "reference": "a19a7376a4689d4d94cab66ab4f3c816019ba8dd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -347,7 +347,7 @@
"input", "input",
"prompt" "prompt"
], ],
"time": "2016-04-18T09:31:41+00:00" "time": "2017-03-18T11:32:45+00:00"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",

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

@ -610,7 +610,7 @@ class RemoteFilesystem
} }
if ($askForOAuthToken) { if ($askForOAuthToken) {
$message = "\n".'Could not fetch ' . $this->fileUrl . ', please create a bitbucket OAuth token to ' . (($httpStatus === 401 || $httpStatus === 403) ? 'to access private repos' : 'to go over the API rate limit'); $message = "\n".'Could not fetch ' . $this->fileUrl . ', please create a bitbucket OAuth token to ' . (($httpStatus === 401 || $httpStatus === 403) ? 'access private repos' : 'go over the API rate limit');
$bitBucketUtil = new Bitbucket($this->io, $this->config); $bitBucketUtil = new Bitbucket($this->io, $this->config);
if (! $bitBucketUtil->authorizeOAuth($this->originUrl) if (! $bitBucketUtil->authorizeOAuth($this->originUrl)
&& (! $this->io->isInteractive() || !$bitBucketUtil->authorizeOAuthInteractively($this->originUrl, $message)) && (! $this->io->isInteractive() || !$bitBucketUtil->authorizeOAuthInteractively($this->originUrl, $message))