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

Fix ConsoleIO::overwrite

pull/219/merge
Jordi Boggiano 2012-01-18 10:35:02 +01:00
parent e218b811e0
commit 6c2ec966ff
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Downloader/FileDownloader.php
View File

@ -24,7 +24,7 @@ use Composer\Package\PackageInterface;
abstract class FileDownloader implements DownloaderInterface
{
protected $io;
protected $bytesMax;
private $bytesMax;
/**
* Constructor.
@ -103,9 +103,9 @@ abstract class FileDownloader implements DownloaderInterface
$ctx = stream_context_create($params);
stream_context_set_params($ctx, array("notification" => array($this, 'callbackGet')));
$this->io->overwrite(" Downloading: <comment>connection...</comment>", 80);
$this->io->overwrite(" Downloading: <comment>connection...</comment>");
copy($url, $fileName, $ctx);
$this->io->overwrite(" Downloading", 80);
$this->io->overwrite(" Downloading");
if (!file_exists($fileName)) {
throw new \UnexpectedValueException($url.' could not be saved to '.$fileName.', make sure the'
@ -193,7 +193,7 @@ abstract class FileDownloader implements DownloaderInterface
}
if (0 === $progression % 5) {
$this->io->overwrite(" Downloading: <comment>$progression%</comment>", 80);
$this->io->overwrite(" Downloading: <comment>$progression%</comment>");
}
}
break;

12
src/Composer/IO/ConsoleIO.php
View File

@ -65,25 +65,25 @@ class ConsoleIO implements IOInterface
/**
* {@inheritDoc}
*/
public function overwrite($messages, $size = 80, $newline = false, $type = 0)
public function overwrite($messages, $size = 80, $newline = false)
{
for ($place = $size; $place > 0; $place--) {
$this->write("\x08");
$this->write("\x08", false);
}
$this->write($messages, false, $type);
$this->write($messages, false);
for ($place = ($size - strlen($messages)); $place > 0; $place--) {
$this->write(' ');
$this->write(' ', false);
}
// clean up the end line
for ($place = ($size - strlen($messages)); $place > 0; $place--) {
$this->write("\x08");
$this->write("\x08", false);
}
if ($newline) {
$this->writeln('');
$this->write('');
}
}