Inverting function names for internal closures in _bindParams as they

make more sense now
cakephp · Mar 7, 2013 · d44abb3 · d44abb3
1 parent 28d95c4
commit d44abb3
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/Cake/Model/Datasource/Database/Query.php b/lib/Cake/Model/Datasource/Database/Query.php
@@ -1433,7 +1433,7 @@ protected function _conjugate($part, $append, $conjunction, $types) {
  * @return void
  */
 	protected function _bindParams($statement) {
-		$visitor = function($expression) use ($statement) {
+		$binder = function($expression) use ($statement) {
 			$params = $types = [];
 
 			if ($expression instanceof Comparison) {
@@ -1450,10 +1450,10 @@ protected function _bindParams($statement) {
 		};
 
 		$refs = [];
-		$binder = function($expression, $name = null) use ($statement, $visitor, &$binder, &$refs) {
+		$visitor = function($expression, $name = null) use ($statement, &$visitor, $binder, &$refs) {
 			if (is_array($expression)) {
 				foreach ($expression as $e) {
-					$binder($e, $name);
+					$visitor($e, $name);
 				}
 				return;
 			}
@@ -1466,15 +1466,15 @@ protected function _bindParams($statement) {
 				}
 
 				$refs[$id] = 1;
-				$expression->traverse($binder);
+				$expression->traverse($visitor);
 
 				if (!($expression instanceof self)) {
-					$visitor($expression);
+					$binder($expression);
 				}
 			}
 		};
 
-		$this->_transformQuery()->traverse($binder);
+		$this->_transformQuery()->traverse($visitor);
 	}
 
 /**