Changeset 3135

Timestamp:

07/17/2008 08:14:17 AM (5 months ago)

Author:

Geert

Message:

Fixing #563 again. Cache not found? Return NULL.

Location:

trunk/system/libraries

Files:

• Cache.php (modified) (2 diffs)
• drivers/Cache.php (modified) (1 diff)
• drivers/Cache/Apc.php (modified) (1 diff)
• drivers/Cache/Eaccelerator.php (modified) (1 diff)
• drivers/Cache/File.php (modified) (3 diffs)
• drivers/Cache/Memcache.php (modified) (1 diff)
• drivers/Cache/Sqlite.php (modified) (1 diff)
• drivers/Cache/Xcache.php (modified) (1 diff)

trunk/system/libraries/Cache.php

@@ -99 +99 @@
         /**
          * Fetches a cache by id. Non-string cache items are automatically
-         * unserialized before the cache is returned. FALSE is returned when
+         * unserialized before the cache is returned. NULL is returned when
          * a cache item is not found.
          *
          * @param   string  cache id
-         * @return  mixed   cached data or FALSE
+         * @return  mixed   cached data or NULL
          */
         public function get($id)
@@ -137 +137 @@
                         {
                                 // Load each cache item and add it to the array
-                                if (($cache = $this->get($id)) !== FALSE)
+                                if (($cache = $this->get($id)) !== NULL)
                                 {
                                         $data[$id] = $cache;

trunk/system/libraries/drivers/Cache.php

@@ -24 +24 @@
         /**
          * Get a cache item.
-         * Return FALSE if the cache item is not found.
+         * Return NULL if the cache item is not found.
          */
         public function get($id);

trunk/system/libraries/drivers/Cache/Apc.php

@@ -20 +20 @@
         public function get($id)
         {
-                return apc_fetch($id);
+                return (($return = apc_fetch($id)) === FALSE) ? NULL : $return;
         }
 

trunk/system/libraries/drivers/Cache/Eaccelerator.php

@@ -20 +20 @@
         public function get($id)
         {
-                return (($return = eaccelerator_get($id)) === NULL) ? FALSE : $return;
+                return eaccelerator_get($id);
         }
 

trunk/system/libraries/drivers/Cache/File.php

@@ -137 +137 @@
          * the hash does not match the stored hash.
          *
-         * @param  string  cache id
-         * @return mixed|NULL
+         * @param   string  cache id
+         * @return  mixed|NULL
          */
         public function get($id)
@@ -174 +174 @@
                 }
 
-                // Return FALSE if there is no data
-                return isset($data) ? $data : FALSE;
+                // Return NULL if there is no data
+                return isset($data) ? $data : NULL;
         }
 
@@ -181 +181 @@
          * Deletes a cache item by id or tag
          *
-         * @param  string  cache id or tag, or TRUE for "all items"
-         * @param  bool    use tags
-         * @return bool
+         * @param   string   cache id or tag, or TRUE for "all items"
+         * @param   boolean  use tags
+         * @return  boolean
          */
         public function delete($id, $tag = FALSE)

trunk/system/libraries/drivers/Cache/Memcache.php

@@ -44 +44 @@
         public function get($id)
         {
-                return $this->backend->get($id);
+                return (($return = $this->backend->get($id)) === FALSE) ? NULL : $return;
         }
 

trunk/system/libraries/drivers/Cache/Sqlite.php

@@ -177 +177 @@
                 }
 
-                // No valid cache foud
-                return FALSE;
+                // No valid cache found
+                return NULL;
         }
 

trunk/system/libraries/drivers/Cache/Xcache.php

@@ -23 +23 @@
                         return xcache_get($id);
 
-                return FALSE;
+                return NULL;
         }