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

Undo reformatting from #7441

pull/7483/head
Jordi Boggiano 2018-07-20 12:02:31 +02:00
parent 1983a450b4
commit d5a9d86ee4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Composer/Installer.php
View File

@ -1038,8 +1038,14 @@ class Installer
$package->setReplaces($newPackage->getReplaces()); $package->setReplaces($newPackage->getReplaces());
} }
if ($task === 'force-updates' && $newPackage && ($newPackage->getSourceReference() && $newPackage->getSourceReference() !== $package->getSourceReference()) if (
|| ($newPackage->getDistReference() && $newPackage->getDistReference() !== $package->getDistReference())) { $task === 'force-updates'
&& $newPackage
&& (
($newPackage->getSourceReference() && $newPackage->getSourceReference() !== $package->getSourceReference())
|| ($newPackage->getDistReference() && $newPackage->getDistReference() !== $package->getDistReference())
)
) {
$operations[] = new UpdateOperation($package, $newPackage); $operations[] = new UpdateOperation($package, $newPackage);
continue; continue;