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

Merge remote-tracking branch 'simensen/installed-packages'

pull/1883/merge
Jordi Boggiano 2013-05-11 12:57:02 +02:00
parent b0b90cb61c 3a0e4af132
commit 2f4656e87a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Installer.php
View File

@ -560,8 +560,14 @@ class Installer
$constraint->setPrettyString($rootPackage->getPrettyVersion());
$request->install($rootPackage->getName(), $constraint);
$installedPackages = $platformRepo->getPackages();
if ($this->additionalInstalledRepository) {
$additionalInstalledPackages = $this->additionalInstalledRepository->getPackages();
$installedPackages = array_merge($installedPackages, $additionalInstalledPackages);
}
// fix the version of all platform packages to prevent the solver trying to remove those
foreach ($platformRepo->getPackages() as $package) {
foreach ($installedPackages as $package) {
$constraint = new VersionConstraint('=', $package->getVersion());
$constraint->setPrettyString($package->getPrettyVersion());