Various tweaks and fixes

capkokoon · capkokoon · commit 7fcdb58cb0d4 · 2015-08-22T16:53:52.000+02:00
Add .gitignore
Fix deleteExpired function
Use TTL (relative time) rather than absolute timestamp to eval
expiration
Add simple demo
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+cache/
diff --git a/cache.class.php b/cache.class.php
@@ -79,11 +79,16 @@ public function isCached($key)
     *
     * @param string $key
     * @param mixed $data
-    * @param integer [optional] $expires
+    * @param mixed [optional] $expires / TTL of the data in seconds
     * @return self
     */
     public function store($key, $data, $expires = 0)
     {
+        if (is_string($expires)) {
+            if (intval($expires) > 0) {
+                $expires = strtotime($expires, 0);
+            }
+        }
         $new_data = array(
             'time' => time(),
             'expire' => (int) $expires,
@@ -104,8 +109,7 @@ public function store($key, $data, $expires = 0)
     * Retrieve cached data by key
     *
     * @param string $key
-    * @param boolean [optional] $timestamp
-    * @return string
+    * @return mixed
     */
     public function retrieve($key)
     {
@@ -171,12 +175,12 @@ public function deleteExpired()
         $cache = $this->_loadCache();
         if (is_array($cache)) {
             $i = 0;
-            $cache = array_map(function ($value) {
-                        if (!$this->_isExpired($value['time'], $value['expire'])) {
-                            ++$i;
-                            return $value;
-                        }
-                        });
+            foreach ($cache as $key => $value) {
+                if ($this->_isExpired($value['time'], $value['expire'])) {
+                    unset($cache[$key]);
+                    ++$i;
+                }
+            }
             if ($i > 0) {
                 $this->_saveCache($cache);
             }
diff --git a/demo.php b/demo.php
@@ -0,0 +1,9 @@
+<?php
+include 'cache.class.php';
+$settings = array('testcache');
+$cache = new \Cache();
+$cache->store('test', 14345, '0');
+$cache->store('test2', 6.34324);
+$cache->deleteExpired();
+var_dump($cache);
+ ?>
