Fixing tests and simplifying map reduce code in find('list')

Author: lorenzo

lib/Cake/ORM/Table.php

@@ -530,16 +530,17 @@ public function findList(Query $query, array $options = []) {
 				$columns = array_slice(array_keys($row), 0, 3);
 			}
 
-			$key = isset($columns[2]) ? $row[$columns[2]] : $key;
 			list($rowKey, $rowVal) = $columns;
+			if (!isset($columns[2])) {
+				$mr->emit($row[$rowVal], $row[$rowKey]);
+				return;
+			}
+
+			$key = $row[$columns[2]];
 			$mr->emitIntermediate($key, [$row[$rowKey] => $row[$rowVal]]);
 		};
 
 		$reducer = function($key, $values, $mr) use (&$columns) {
-			if (!isset($columns[2])) {
-				$mr->emit(current(current($values)), key(current($values)));
-				return;
-			}
 			$result = [];
 			foreach ($values as $value) {
 				$result += $value;

lib/Cake/Test/TestCase/ORM/TableTest.php

@@ -533,7 +533,7 @@ public function testFindList() {
 			],
 			1 => [
 				2 => 'nate',
-				4 => 'garret'
+				4 => 'garrett'
 			]
 		];
 		$this->assertSame($expected, $query->toArray());