Merge pull request #60 from crazedr0m/WatermarkedPeerGetList

* requested indexes in result instead of watermarked

Author: crazedr0m

core/Cache/CachePeer.class.php

@@ -150,7 +150,7 @@ public function getList($indexes)
 
 			foreach ($indexes as $key)
 				if (null !== ($value = $this->get($key)))
-					$out[] = $value;
+					$out[$key] = $value;
 
 			return $out;
 		}

core/Cache/WatermarkedPeer.class.php

@@ -110,10 +110,23 @@ public function decrement($key, $value)
 
 		public function getList($indexes)
 		{
-			foreach ($indexes as &$index)
-				$index = $this->getActualWatermark().$index;
-			
-			return $this->peer->getList($indexes);
+			$peerIndexMap = array();
+			foreach ($indexes as $index)
+				$peerIndexMap[$this->getActualWatermark().$index] = $index;
+
+			$peerIndexes = array_keys($peerIndexMap);
+			$peerResult = $this->peer->getList($peerIndexes);
+
+			$result = array();
+			if (!empty($peerResult)) {
+				foreach ($peerResult as $key => $value) {
+					$result[$peerIndexMap[$key]] = $value;
+				}
+			} else {
+				$result = $peerResult;
+			}
+
+			return $result;
 		}
 
 		public function get($key)

test/core/WatermarkedPeerTest.class.php

@@ -0,0 +1,50 @@
+<?php
+
+	final class WatermarkedPeerTest extends TestCase
+	{
+
+		public function testMultiGet()
+		{
+
+			$cache = new WatermarkedPeer(new RuntimeMemory());
+
+			$cache->clean();
+			
+			$cache->set('a', 'a', Cache::EXPIRES_MEDIUM);
+			$cache->set('b', 2, Cache::EXPIRES_MEDIUM);
+			$cache->set('c', 42.28, Cache::EXPIRES_MEDIUM);
+			
+			$this->assertEquals($cache->get('a'), 'a');
+			$this->assertEquals($cache->get('b'), 2);
+			$this->assertEquals($cache->get('c'), 42.28);
+			
+			$list = $cache->getList(array('a', 'b', 'c'));
+			
+			$this->assertEquals(count($list), 3);
+			
+			$this->assertEquals($list['a'], 'a');
+			$this->assertEquals($list['b'], 2);
+			$this->assertEquals($list['c'], 42.28);
+			
+			$list = $cache->getList(array('a'));
+			
+			$this->assertEquals(count($list), 1);
+			
+			$this->assertEquals($list['a'], 'a');
+				
+			$list = $cache->getList(array('a', 'b', 'c', 'd'));
+			
+			$this->assertEquals(count($list), 3);
+			
+			$this->assertEquals($list['a'], 'a');
+			$this->assertEquals($list['b'], 2);
+			$this->assertEquals($list['c'], 42.28);
+			
+			$list = $cache->getList(array('d'));
+			
+			$this->assertEquals(count($list), 0);
+			
+			$cache->clean();
+		}
+	}
+?>