Explorar o código

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

Nils Adermann %!s(int64=13) %!d(string=hai) anos
pai
achega
e4f40272a3
Modificáronse 1 ficheiros con 3 adicións e 3 borrados
  1. 3 3
      src/Composer/DependencyResolver/Solver.php

+ 3 - 3
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;
             }
         }