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

Merge remote-tracking branch 'bitExpert/feature/repo_basic_auth'

pull/1704/merge
Jordi Boggiano 2013-04-27 17:40:59 +02:00
parent 670b36238a df897b42c2
commit a9db844a41
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -215,9 +215,6 @@ class RemoteFilesystem
{ {
switch ($notificationCode) { switch ($notificationCode) {
case STREAM_NOTIFY_FAILURE: case STREAM_NOTIFY_FAILURE:
throw new TransportException('The "'.$this->fileUrl.'" file could not be downloaded ('.trim($message).')', $messageCode);
break;
case STREAM_NOTIFY_AUTH_REQUIRED: case STREAM_NOTIFY_AUTH_REQUIRED:
if (401 === $messageCode) { if (401 === $messageCode) {
if (!$this->io->isInteractive()) { if (!$this->io->isInteractive()) {
@ -232,8 +229,10 @@ class RemoteFilesystem
$this->io->setAuthentication($this->originUrl, $username, $password); $this->io->setAuthentication($this->originUrl, $username, $password);
$this->get($this->originUrl, $this->fileUrl, $this->fileName, $this->progress); $this->get($this->originUrl, $this->fileUrl, $this->fileName, $this->progress);
}
break; break;
}
throw new TransportException('The "'.$this->fileUrl.'" file could not be downloaded ('.trim($message).')', $messageCode);
case STREAM_NOTIFY_AUTH_RESULT: case STREAM_NOTIFY_AUTH_RESULT:
if (403 === $messageCode) { if (403 === $messageCode) {