From e4f40272a3e480fafc72929459696676f8895605 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 29 Oct 2011 20:05:06 +0200 Subject: [PATCH] Conflict handling: lastWeakWhy stores a rule, not a rule id --- src/Composer/DependencyResolver/Solver.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 983084086..f864273df 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -1544,9 +1544,9 @@ class Solver } if ($conflictRule->isWeak()) { - /** TODO why > or < lastWeakProblem? */ - if (!$lastWeakWhy || $why > $lastWeakWhy) { - $lastWeakProblem = $why; + /** TODO why > or < lastWeakWhy? */ + if (!$lastWeakWhy || $why > $lastWeakWhy->getId()) { + $lastWeakWhy = $conflictRule; } }