From 025581b365d47cc697d3d48e6ec8a5b6d01f3c84 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sat, 19 May 2012 20:50:21 +0200
Subject: [PATCH] Rename walkLiteral method to more explicitly say what it does

---
 src/Composer/DependencyResolver/RuleWatchGraph.php | 2 +-
 src/Composer/DependencyResolver/Solver.php         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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'),