diff --git a/src/Composer/DependencyResolver/RuleWatchGraph.php b/src/Composer/DependencyResolver/RuleWatchGraph.php index d1c652daf..e4bd71417 100644 --- a/src/Composer/DependencyResolver/RuleWatchGraph.php +++ b/src/Composer/DependencyResolver/RuleWatchGraph.php @@ -43,7 +43,7 @@ class RuleWatchGraph return isset($this->watches[$literal]); } - public function walkLiteral($literal, $level, $skipCallback, $conflictCallback, $decideCallback) + public function propagateLiteral($literal, $level, $skipCallback, $conflictCallback, $decideCallback) { if (!isset($this->watches[$literal])) { return null; diff --git a/src/Composer/DependencyResolver/Solver.php b/src/Composer/DependencyResolver/Solver.php index 14328946a..45410ada2 100644 --- a/src/Composer/DependencyResolver/Solver.php +++ b/src/Composer/DependencyResolver/Solver.php @@ -318,7 +318,7 @@ class Solver $this->propagateIndex++; - $conflict = $this->watchGraph->walkLiteral( + $conflict = $this->watchGraph->propagateLiteral( $literal, $level, array($this, 'decisionsContain'),