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

Merge branch 'master' into 2.0

pull/6942/head^2
Jordi Boggiano 2019-08-02 13:45:56 +02:00
parent 1002fb12fc 96ad0aa01f
commit 08d661ceca
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Installer.php
View File

@ -1171,7 +1171,7 @@ class Installer
$newReference = $rootRefs[$package->getName()]; $newReference = $rootRefs[$package->getName()];
} }
$this->updatePackageUrl($package, $newSourceUrl, $newPackage->getSourceType(), $newReference, $newPackage->getDistUrl(), $newPackage->getDistType(), $newPackage->getDistSha1Checksum(), $newPackage); $this->updatePackageUrl($package, $newSourceUrl, $newPackage->getSourceType(), $newReference, $newPackage->getDistUrl(), $newPackage->getDistType(), $newPackage->getDistSha1Checksum());
if ($package instanceof CompletePackage && $newPackage instanceof CompletePackage) { if ($package instanceof CompletePackage && $newPackage instanceof CompletePackage) {
$package->setAbandoned($newPackage->getReplacementPackage() ?: $newPackage->isAbandoned()); $package->setAbandoned($newPackage->getReplacementPackage() ?: $newPackage->isAbandoned());