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

Refactoring the Cache class.

This commit is contained in:
Taylor Otwell 2011-08-08 08:41:35 -05:00
parent 89032f8a2a
commit fe39d50783
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
system/cache.php
View File

@ -3,7 +3,7 @@
class Cache { class Cache {
/** /**
* The active cache drivers. * All of the active cache drivers.
* *
* @var Cache\Driver * @var Cache\Driver
*/ */
@ -13,8 +13,6 @@ class Cache {
* Get a cache driver instance. If no driver name is specified, the default * 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. * cache driver will be returned as defined in the cache configuration file.
* *
* Note: Cache drivers are managed as singleton instances.
*
* @param string $driver * @param string $driver
* @return Cache\Driver * @return Cache\Driver
*/ */
@ -54,10 +52,7 @@ public static function driver($driver = null)
*/ */
public static function get($key, $default = null, $driver = null) public static function get($key, $default = null, $driver = null)
{ {
if (is_null($driver)) if (is_null($driver)) $driver = Config::get('cache.driver');
{
$driver = Config::get('cache.driver');
}
if (is_null($item = static::driver($driver)->get($key))) if (is_null($item = static::driver($driver)->get($key)))
{ {
@ -79,10 +74,7 @@ public static function get($key, $default = null, $driver = null)
*/ */
public static function remember($key, $default, $minutes, $driver = null) public static function remember($key, $default, $minutes, $driver = null)
{ {
if ( ! is_null($item = static::get($key, null, $driver))) if ( ! is_null($item = static::get($key, null, $driver))) return $item;
{
return $item;
}
$default = is_callable($default) ? call_user_func($default) : $default; $default = is_callable($default) ? call_user_func($default) : $default;
@ -96,7 +88,7 @@ public static function remember($key, $default, $minutes, $driver = null)
* *
* Passing method calls to the driver instance provides a better API for the * Passing method calls to the driver instance provides a better API for the
* developer. For instance, instead of saying Cache::driver()->foo(), we can * developer. For instance, instead of saying Cache::driver()->foo(), we can
* now just say Cache::foo(). * just say Cache::foo().
*/ */
public static function __callStatic($method, $parameters) public static function __callStatic($method, $parameters)
{ {