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

Add changes requested

pull/293/head
François Pluchino 2012-02-16 23:41:26 +01:00
parent 2e3eed081a
commit dbfbbab904
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class RemoteFilesystem
* @param string $fileUrl The file URL * @param string $fileUrl The file URL
* @param boolean $progess Display the progression * @param boolean $progess Display the progression
* *
* @return false|string The content * @return string The content
*/ */
public function getContents($originUrl, $fileUrl, $progess = true) public function getContents($originUrl, $fileUrl, $progess = true)
{ {
@ -75,7 +75,7 @@ class RemoteFilesystem
* @param string $fileName the local filename * @param string $fileName the local filename
* @param boolean $progess Display the progression * @param boolean $progess Display the progression
* *
* @throws \RuntimeException When the openssl extension is disabled * @throws \RuntimeException When the file could not be downloaded
*/ */
protected function get($originUrl, $fileUrl, $fileName = null, $progess = true) protected function get($originUrl, $fileUrl, $fileName = null, $progess = true)
{ {
@ -93,7 +93,6 @@ class RemoteFilesystem
$auth = $this->io->getAuthorization($originUrl); $auth = $this->io->getAuthorization($originUrl);
$authStr = base64_encode($auth['username'] . ':' . $auth['password']); $authStr = base64_encode($auth['username'] . ':' . $auth['password']);
$options['http']['header'] = "Authorization: Basic $authStr\r\n"; $options['http']['header'] = "Authorization: Basic $authStr\r\n";
} else if (null !== $this->io->getLastUsername()) { } else if (null !== $this->io->getLastUsername()) {
$authStr = base64_encode($this->io->getLastUsername() . ':' . $this->io->getLastPassword()); $authStr = base64_encode($this->io->getLastUsername() . ':' . $this->io->getLastPassword());
$options['http'] = array('header' => "Authorization: Basic $authStr\r\n"); $options['http'] = array('header' => "Authorization: Basic $authStr\r\n");
@ -107,15 +106,19 @@ class RemoteFilesystem
} }
if (null !== $fileName) { if (null !== $fileName) {
@copy($fileUrl, $fileName, $ctx); $result = @copy($fileUrl, $fileName, $ctx);
} else { } else {
$this->content = @file_get_contents($fileUrl, false, $ctx); $result = @file_get_contents($fileUrl, false, $ctx);
$this->content = $result;
} }
if ($this->progress) { if ($this->progress) {
$this->io->overwrite(" Downloading", false); $this->io->overwrite(" Downloading", false);
} }
if (false === $result) {
throw new \RuntimeException("the '$fileUrl' file could not be downloaded");
}
} }
/** /**