From 213f0e85b6a56d88a6928a29e6707779a98c38a7 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Tue, 31 Dec 2013 16:20:11 +0100 Subject: [PATCH] Updating tests having calls to mapReduce to account for new parameter order --- Cake/Test/TestCase/ORM/QueryTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Cake/Test/TestCase/ORM/QueryTest.php b/Cake/Test/TestCase/ORM/QueryTest.php index a0bc12229ee..d3adb230dbf 100644 --- a/Cake/Test/TestCase/ORM/QueryTest.php +++ b/Cake/Test/TestCase/ORM/QueryTest.php @@ -1051,14 +1051,14 @@ public function testResultsAreWrappedInMapReduce() { ->method('execute') ->will($this->returnValue($statement)); - $query->mapReduce(function($k, $v, $mr) { + $query->mapReduce(function($v, $k, $mr) { $mr->emit($v['a']); }); $query->mapReduce( - function($k, $v, $mr) { - $mr->emitIntermediate($k, $v); + function($v, $k, $mr) { + $mr->emitIntermediate($v, $k); }, - function($k, $v, $mr) { + function($v, $k, $mr) { $mr->emit($v[0] + 1); } ); @@ -1118,10 +1118,10 @@ public function testFirstSameResult() { * @return void */ public function testFirstMapReduce() { - $map = function($key, $row, $mapReduce) { - $mapReduce->emitIntermediate('id', $row['id']); + $map = function($row, $key, $mapReduce) { + $mapReduce->emitIntermediate($row['id'], 'id'); }; - $reduce = function($key, $values, $mapReduce) { + $reduce = function($values, $key, $mapReduce) { $mapReduce->emit(array_sum($values)); };