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

Merge remote-tracking branch 'cs278/issue/879-dev-autoload-definitions' 

Conflicts:
	src/Composer/Installer.php
pull/1120/merge
Jordi Boggiano 2012-10-03 11:50:06 +02:00
parent e188f69a0f 3281a0b5df
commit cb2a0f46a1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Installer.php
View File

@ -399,10 +399,7 @@ class Installer
|| ($lockedPackage->getDistReference() && $lockedPackage->getDistReference() !== $package->getDistReference())
)
) {
$newPackage = clone $package;
$newPackage->setSourceReference($lockedPackage->getSourceReference());
$newPackage->setDistReference($lockedPackage->getDistReference());
$operations[] = new UpdateOperation($package, $newPackage);
$operations[] = new UpdateOperation($package, $lockedPackage);
break;
}