From: Jan Schneider <jan@horde.org>
Date: Tue, 30 Nov 2010 14:32:04 +0000 (+0100)
Subject: Default to no expiration.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=52fd487d4ba2d91f1050a1f17f1c5e2416abc265;p=horde.git

Default to no expiration.
---

diff --git a/framework/Cache/lib/Horde/Cache/Storage/Apc.php b/framework/Cache/lib/Horde/Cache/Storage/Apc.php
index f0b7c1351..51fd3c771 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Apc.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Apc.php
@@ -32,7 +32,7 @@ class Horde_Cache_Storage_Apc extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);
@@ -41,7 +41,7 @@ class Horde_Cache_Storage_Apc extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         if (apc_store($key . '_expire', time(), $lifetime)) {
@@ -51,7 +51,7 @@ class Horde_Cache_Storage_Apc extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Base.php b/framework/Cache/lib/Horde/Cache/Storage/Base.php
index 18666bc6d..ff1e22a66 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Base.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Base.php
@@ -57,7 +57,7 @@ abstract class Horde_Cache_Storage_Base
      *
      * @return mixed  Cached data, or false if none was found.
      */
-    abstract public function get($key, $lifetime);
+    abstract public function get($key, $lifetime = 0);
 
     /**
      * Store an object in the cache.
@@ -68,7 +68,7 @@ abstract class Horde_Cache_Storage_Base
      *                           data becomes available for garbage
      *                           collection. If 0 will not be GC'd.
      */
-    abstract public function set($key, $data, $lifetime);
+    abstract public function set($key, $data, $lifetime = 0);
 
     /**
      * Checks if a given key exists in the cache, valid for the given
@@ -79,7 +79,7 @@ abstract class Horde_Cache_Storage_Base
      *
      * @return boolean  Existence.
      */
-    abstract public function exists($key, $lifetime);
+    abstract public function exists($key, $lifetime = 0);
 
     /**
      * Expire any existing data for the given key.
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php b/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php
index 349b152eb..695b8b461 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Eaccelerator.php
@@ -38,7 +38,7 @@ class Horde_Cache_Storage_Eaccelerator extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);
@@ -47,7 +47,7 @@ class Horde_Cache_Storage_Eaccelerator extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         if (eaccelerator_put($key . '_expire', time(), $lifetime)) {
@@ -57,7 +57,7 @@ class Horde_Cache_Storage_Eaccelerator extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);
diff --git a/framework/Cache/lib/Horde/Cache/Storage/File.php b/framework/Cache/lib/Horde/Cache/Storage/File.php
index 7aa1e6f9b..e833da411 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/File.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/File.php
@@ -120,7 +120,7 @@ class Horde_Cache_Storage_File extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         if (!$this->exists($key, $lifetime)) {
             /* Nothing cached, return failure. */
@@ -137,7 +137,7 @@ class Horde_Cache_Storage_File extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $filename = $this->_keyToFile($key, true);
         $tmp_file = Horde_Util::getTempFile('HordeCache', true, $this->_dir);
@@ -163,7 +163,7 @@ class Horde_Cache_Storage_File extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $filename = $this->_keyToFile($key);
 
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Memcache.php b/framework/Cache/lib/Horde/Cache/Storage/Memcache.php
index 81a025582..e68b2335d 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Memcache.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Memcache.php
@@ -59,7 +59,7 @@ class Horde_Cache_Storage_Memcache extends Horde_Cache_Storage_Base implements S
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         if (isset($this->_expirecache[$key])) {
@@ -91,7 +91,7 @@ class Horde_Cache_Storage_Memcache extends Horde_Cache_Storage_Base implements S
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
 
@@ -102,7 +102,7 @@ class Horde_Cache_Storage_Memcache extends Horde_Cache_Storage_Base implements S
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
 
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Mock.php b/framework/Cache/lib/Horde/Cache/Storage/Mock.php
index 6f43c309c..46fae77d7 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Mock.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Mock.php
@@ -26,7 +26,7 @@ class Horde_Cache_Storage_Mock extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         return isset($this->_cache[$key])
             ? $this->_cache[$key]
@@ -35,14 +35,14 @@ class Horde_Cache_Storage_Mock extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $this->_cache[$key] = $data;
     }
 
     /**
      */
-    public function exists($key, $lifetime = 1)
+    public function exists($key, $lifetime = 0)
     {
         return isset($this->_cache[$key]);
     }
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Null.php b/framework/Cache/lib/Horde/Cache/Storage/Null.php
index 73d6261f9..68528e822 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Null.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Null.php
@@ -16,20 +16,20 @@ class Horde_Cache_Storage_Null extends Horde_Cache_Storage_Base
 {
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         return false;
     }
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
     }
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         return false;
     }
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Session.php b/framework/Cache/lib/Horde/Cache/Storage/Session.php
index c0b0aec8e..e0a8bd764 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Session.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Session.php
@@ -46,7 +46,7 @@ class Horde_Cache_Storage_Session extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         return $this->exists($key, $lifetime)
             ? $this->_sess[$key]['d']
@@ -55,7 +55,7 @@ class Horde_Cache_Storage_Session extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $this->_sess[$key] = array(
             'd' => $data,
@@ -65,7 +65,7 @@ class Horde_Cache_Storage_Session extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         if (isset($this->_sess[$key])) {
             /* 0 means no expire. */
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Sql.php b/framework/Cache/lib/Horde/Cache/Storage/Sql.php
index 328fe021c..b1ea25408 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Sql.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Sql.php
@@ -85,7 +85,7 @@ class Horde_Cache_Storage_Sql extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         $okey = $key;
         $key = hash('md5', $key);
@@ -127,7 +127,7 @@ class Horde_Cache_Storage_Sql extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $okey = $key;
         $key = hash('md5', $key);
@@ -165,7 +165,7 @@ class Horde_Cache_Storage_Sql extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $okey = $key;
         $key = hash('md5', $key);
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Stack.php b/framework/Cache/lib/Horde/Cache/Storage/Stack.php
index f22ea8515..09e9e42aa 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Stack.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Stack.php
@@ -48,7 +48,7 @@ class Horde_Cache_Storage_Stack extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         foreach ($this->_stack as $val) {
             $result = $val->get($key, $lifetime);
@@ -62,7 +62,7 @@ class Horde_Cache_Storage_Stack extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         /* Do writes in *reverse* order - it is OK if a write to one of the
          * non-master backends fails. */
@@ -84,7 +84,7 @@ class Horde_Cache_Storage_Stack extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         foreach ($this->_stack as $val) {
             $result = $val->exists($key, $lifetime);
diff --git a/framework/Cache/lib/Horde/Cache/Storage/Xcache.php b/framework/Cache/lib/Horde/Cache/Storage/Xcache.php
index 6f969d19b..29ef31f2a 100644
--- a/framework/Cache/lib/Horde/Cache/Storage/Xcache.php
+++ b/framework/Cache/lib/Horde/Cache/Storage/Xcache.php
@@ -32,7 +32,7 @@ class Horde_Cache_Storage_Xcache extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function get($key, $lifetime)
+    public function get($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);
@@ -45,7 +45,7 @@ class Horde_Cache_Storage_Xcache extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function set($key, $data, $lifetime)
+    public function set($key, $data, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         if (xcache_set($key . '_expire', time(), $lifetime)) {
@@ -55,7 +55,7 @@ class Horde_Cache_Storage_Xcache extends Horde_Cache_Storage_Base
 
     /**
      */
-    public function exists($key, $lifetime)
+    public function exists($key, $lifetime = 0)
     {
         $key = $this->_params['prefix'] . $key;
         $this->_setExpire($key, $lifetime);