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

Conflict handling: lastWeakWhy stores a rule, not a rule id

pull/72/head
Nils Adermann 2011-10-29 20:05:06 +02:00
parent 3e0e893f26
commit e4f40272a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1544,9 +1544,9 @@ class Solver
} }
if ($conflictRule->isWeak()) { if ($conflictRule->isWeak()) {
/** TODO why > or < lastWeakProblem? */ /** TODO why > or < lastWeakWhy? */
if (!$lastWeakWhy || $why > $lastWeakWhy) { if (!$lastWeakWhy || $why > $lastWeakWhy->getId()) {
$lastWeakProblem = $why; $lastWeakWhy = $conflictRule;
} }
} }