Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactoring cache class.

This commit is contained in:
Taylor Otwell 2011-07-07 23:07:44 -05:00
parent 22c1353cea
commit 8203bd9af5
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
system/cache.php
View File

@ -10,7 +10,10 @@ class Cache {
private static $drivers = array();
/**
* Get a cache driver instance. Cache drivers are singletons.
* Get a cache driver instance. If no driver name is specified, the default
* cache driver will be returned as defined in the cache configuration file.
*
* Note: Cache drivers are managed as singleton instances.
*
* @param string $driver
* @return Cache\Driver
@ -22,12 +25,9 @@ public static function driver($driver = null)
$driver = Config::get('cache.driver');
}
if ( ! array_key_exists($driver, static::$drivers))
{
static::$drivers[$driver] = Cache\Factory::make($driver);
}
return static::$drivers[$driver];
return (array_key_exists($driver, static::$drivers))
? static::$drivers[$driver]
: static::$drivers[$driver] = Cache\Factory::make($driver);
}
/**
@ -40,9 +40,7 @@ public static function driver($driver = null)
*/
public static function get($key, $default = null, $driver = null)
{
$item = static::driver($driver)->get($key);
if (is_null($item))
if (is_null($item = static::driver($driver)->get($key)))
{
return is_callable($default) ? call_user_func($default) : $default;
}
@ -51,8 +49,8 @@ public static function get($key, $default = null, $driver = null)
}
/**
* Get an item from the cache. If it doesn't exist, store the default value
* in the cache and return it.
* Get an item from the cache. If the item doesn't exist in the cache, store
* the default value in the cache and return it.
*
* @param string $key
* @param mixed $default
@ -60,7 +58,7 @@ public static function get($key, $default = null, $driver = null)
* @param string $driver
* @return mixed
*/
public static function maybe($key, $default, $minutes, $driver = null)
public static function remember($key, $default, $minutes, $driver = null)
{
if ( ! is_null($item = static::get($key)))
{