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

Also detect updates resulting from feature rules rather than update rules

pull/72/head
Nils Adermann 2011-10-29 19:39:18 +02:00
parent 2056c4c732
commit 85d38c653f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Composer/DependencyResolver/Solver.php
View File

@ -1089,9 +1089,16 @@ class Solver
// !wanted & installed // !wanted & installed
if (!$literal->isWanted() && isset($this->installedPackageMap[$package->getId()])) { if (!$literal->isWanted() && isset($this->installedPackageMap[$package->getId()])) {
$updateRule = $this->packageToUpdateRule[$package->getId()]; $literals = array();
foreach ($updateRule->getLiterals() as $updateLiteral) { if (isset($this->packageToUpdateRule[$package->getId()])) {
$literals = array_merge($literals, $this->packageToUpdateRule[$package->getId()]->getLiterals());
}
if (isset($this->packageToFeatureRule[$package->getId()])) {
$literals = array_merge($literals, $this->packageToFeatureRule[$package->getId()]->getLiterals());
}
foreach ($literals as $updateLiteral) {
if (!$updateLiteral->equals($literal)) { if (!$updateLiteral->equals($literal)) {
$installMeansUpdateMap[$updateLiteral->getPackageId()] = $package; $installMeansUpdateMap[$updateLiteral->getPackageId()] = $package;
} }