Merge pull request zendframework/zendframework#7068 from marc-mabe/be…

…tterCampatibilityWithApcu_master Cache: better compatibility with APCu
zendframework · Dec 31, 2014 · 2f967c1 · 2f967c1
2 parents 8b9a054 + 35a3d62
commit 2f967c1
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/Storage/Adapter/Apc.php b/src/Storage/Adapter/Apc.php
@@ -717,20 +717,16 @@ protected function internalGetCapabilities()
      */
     protected function normalizeMetadata(array & $metadata)
     {
-        $metadata['internal_key'] = $metadata['key'];
-        $metadata['ctime']        = $metadata['creation_time'];
-        $metadata['atime']        = $metadata['access_time'];
-        $metadata['rtime']        = $metadata['deletion_time'];
-        $metadata['size']         = $metadata['mem_size'];
-        $metadata['hits']         = $metadata['num_hits'];
-
-        unset(
-            $metadata['key'],
-            $metadata['creation_time'],
-            $metadata['access_time'],
-            $metadata['deletion_time'],
-            $metadata['mem_size'],
-            $metadata['num_hits']
+        $apcMetadata = $metadata;
+        $metadata = array(
+            'internal_key' => isset($metadata['key']) ? $metadata['key'] : $metadata['info'],
+            'atime'        => isset($metadata['access_time']) ? $metadata['access_time'] : $metadata['atime'],
+            'ctime'        => isset($metadata['creation_time']) ? $metadata['creation_time'] : $metadata['ctime'],
+            'mtime'        => isset($metadata['modified_time']) ? $metadata['modified_time'] : $metadata['mtime'],
+            'rtime'        => isset($metadata['deletion_time']) ? $metadata['deletion_time'] : $metadata['dtime'],
+            'size'         => $metadata['mem_size'],
+            'hits'         => isset($metadata['nhits']) ? $metadata['nhits'] : $metadata['num_hits'],
+            'ttl'          => $metadata['ttl'],
         );
     }