Improve CacheTrait::getMultiple()

getgrav · May 31, 2017 · c4fac41 · c4fac41
1 parent 512aae3
commit c4fac41
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/system/src/Grav/Framework/Cache/CacheTrait.php b/system/src/Grav/Framework/Cache/CacheTrait.php
@@ -125,16 +125,17 @@ public function getMultiple($keys, $default = null)
 
         $list = $this->doGetMultiple($keys, $this->miss);
 
-        if (count($list) !== count($keys)) {
-            foreach ($keys as $key) {
-                if (!array_key_exists($key, $list) || $list[$key] === $this->miss) {
-                    $list[$key] = $default;
-                }
+        // Make sure that values are returned in the same order as the keys were given.
+        $values = [];
+        foreach ($keys as $key) {
+            if (!array_key_exists($key, $list) || $list[$key] === $this->miss) {
+                $values[$key] = $default;
+            } else {
+                $values[$key] = $list[$key];
             }
         }
 
-        // Make sure that results are returned in the same order as the keys were given.
-        return array_replace(array_flip($keys), $list);
+        return $values;
     }
 
     /**