Browse Source

overwrite -> overwriteError

Rob Bast 10 years ago
parent
commit
3d329622d7

+ 4 - 4
src/Composer/Repository/VcsRepository.php

@@ -136,7 +136,7 @@ class VcsRepository extends ArrayRepository
             if ($verbose) {
                 $this->io->writeError($msg);
             } else {
-                $this->io->overwrite($msg, false);
+                $this->io->overwriteError($msg, false);
             }
 
             // strip the release- prefix from tags if present
@@ -192,7 +192,7 @@ class VcsRepository extends ArrayRepository
         }
 
         if (!$verbose) {
-            $this->io->overwrite('', false);
+            $this->io->overwriteError('', false);
         }
 
         foreach ($driver->getBranches() as $branch => $identifier) {
@@ -200,7 +200,7 @@ class VcsRepository extends ArrayRepository
             if ($verbose) {
                 $this->io->writeError($msg);
             } else {
-                $this->io->overwrite($msg, false);
+                $this->io->overwriteError($msg, false);
             }
 
             if (!$parsedBranch = $this->validateBranch($branch)) {
@@ -257,7 +257,7 @@ class VcsRepository extends ArrayRepository
         $driver->cleanup();
 
         if (!$verbose) {
-            $this->io->overwrite('', false);
+            $this->io->overwriteError('', false);
         }
 
         if (!$this->getPackages()) {

+ 3 - 3
src/Composer/Util/RemoteFilesystem.php

@@ -228,7 +228,7 @@ class RemoteFilesystem
         }
 
         if ($this->progress && !$this->retry) {
-            $this->io->overwrite("    Downloading: <comment>100%</comment>");
+            $this->io->overwriteError("    Downloading: <comment>100%</comment>");
         }
 
         // handle copy command if download was successful
@@ -329,7 +329,7 @@ class RemoteFilesystem
 
                     if ((0 === $progression % 5) && $progression !== $this->lastProgress) {
                         $this->lastProgress = $progression;
-                        $this->io->overwrite("    Downloading: <comment>$progression%</comment>", false);
+                        $this->io->overwriteError("    Downloading: <comment>$progression%</comment>", false);
                     }
                 }
                 break;
@@ -371,7 +371,7 @@ class RemoteFilesystem
                 throw new TransportException("Invalid credentials for '" . $this->fileUrl . "', aborting.", $httpStatus);
             }
 
-            $this->io->overwrite('    Authentication required (<info>'.parse_url($this->fileUrl, PHP_URL_HOST).'</info>):');
+            $this->io->overwriteError('    Authentication required (<info>'.parse_url($this->fileUrl, PHP_URL_HOST).'</info>):');
             $username = $this->io->ask('      Username: ');
             $password = $this->io->askAndHideAnswer('      Password: ');
             $this->io->setAuthentication($this->originUrl, $username, $password);

+ 1 - 1
tests/Composer/Test/Util/RemoteFilesystemTest.php

@@ -119,7 +119,7 @@ class RemoteFilesystemTest extends \PHPUnit_Framework_TestCase
         $io = $this->getMock('Composer\IO\IOInterface');
         $io
             ->expects($this->once())
-            ->method('overwrite')
+            ->method('overwriteError')
         ;
 
         $fs = new RemoteFilesystem($io);