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

Use Upgrading for package installs too

pull/8566/head
Jordi Boggiano 2020-02-11 17:51:02 +01:00
parent 9609729de7
commit 7e142b5d6b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,7 +271,7 @@ class FileDownloader implements DownloaderInterface, ChangeReportInterface
$from = $initial->getFullPrettyVersion(); $from = $initial->getFullPrettyVersion();
$to = $target->getFullPrettyVersion(); $to = $target->getFullPrettyVersion();
$actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Updating' : 'Downgrading'; $actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Upgrading' : 'Downgrading';
$this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>): ", false); $this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>): ", false);
$this->remove($initial, $path, false); $this->remove($initial, $path, false);

2
src/Composer/Downloader/VcsDownloader.php
View File

@ -165,7 +165,7 @@ abstract class VcsDownloader implements DownloaderInterface, ChangeReportInterfa
$to = $target->getFullPrettyVersion(); $to = $target->getFullPrettyVersion();
} }
$actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Updating' : 'Downgrading'; $actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Upgrading' : 'Downgrading';
$this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>): ", false); $this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>): ", false);
$urls = $this->prepareUrls($target->getSourceUrls()); $urls = $this->prepareUrls($target->getSourceUrls());

2
src/Composer/Installer/MetapackageInstaller.php
View File

@ -93,7 +93,7 @@ class MetapackageInstaller implements InstallerInterface
$name = $target->getName(); $name = $target->getName();
$from = $initial->getFullPrettyVersion(); $from = $initial->getFullPrettyVersion();
$to = $target->getFullPrettyVersion(); $to = $target->getFullPrettyVersion();
$actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Updating' : 'Downgrading'; $actionName = VersionParser::isUpgrade($initial->getVersion(), $target->getVersion()) ? 'Upgrading' : 'Downgrading';
$this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>)"); $this->io->writeError(" - " . $actionName . " <info>" . $name . "</info> (<comment>" . $from . "</comment> => <comment>" . $to . "</comment>)");
$repo->removePackage($initial); $repo->removePackage($initial);

2
tests/Composer/Test/Downloader/GitDownloaderTest.php
View File

@ -691,7 +691,7 @@ composer https://github.com/old/url (push)
$ioMock = $this->getMockBuilder('Composer\IO\IOInterface')->getMock(); $ioMock = $this->getMockBuilder('Composer\IO\IOInterface')->getMock();
$ioMock->expects($this->at(0)) $ioMock->expects($this->at(0))
->method('writeError') ->method('writeError')
->with($this->stringContains('Updating')); ->with($this->stringContains('Upgrading'));
$this->fs->ensureDirectoryExists($this->workingDir.'/.git'); $this->fs->ensureDirectoryExists($this->workingDir.'/.git');
$downloader = $this->getDownloaderMock($ioMock, null, $processExecutor); $downloader = $this->getDownloaderMock($ioMock, null, $processExecutor);