ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed cache and session factories. moved cache item management into cache class and out of drivers. tweaked auth class.

Browse Source
This commit is contained in:
Taylor Otwell
2011-07-09 22:15:42 -05:00
parent ceb0e1a807
commit ca58f80b22
7 changed files with 24 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
system/cache/driver/apc.php vendored
View File

@@ -1,13 +1,8 @@
<?php namespace System\Cache\Driver;
class APC implements \System\Cache\Driver {
use System\Config;
/**
* All of the loaded cache items.
*
* @var array
*/
public $items = array();
class APC implements \System\Cache\Driver {
/**
* Determine if an item exists in the cache.
@@ -28,14 +23,7 @@ class APC implements \System\Cache\Driver {
*/
public function get($key)
{
$cache = apc_fetch(\System\Config::get('cache.key').$key);
if ($cache === false)
{
return null;
}
return $this->items[$key] = $cache;
return ( ! is_null($cache = apc_fetch(Config::get('cache.key').$key))) ? $cache : null;
}
/**
@@ -48,7 +36,7 @@ class APC implements \System\Cache\Driver {
*/
public function put($key, $value, $minutes)
{
apc_store(\System\Config::get('cache.key').$key, $value, $minutes * 60);
apc_store(Config::get('cache.key').$key, $value, $minutes * 60);
}
/**
@@ -59,7 +47,7 @@ class APC implements \System\Cache\Driver {
*/
public function forget($key)
{
apc_delete(\System\Config::get('cache.key').$key);
apc_delete(Config::get('cache.key').$key);
}
}

9
system/cache/driver/file.php vendored
View File

@@ -2,13 +2,6 @@
class File implements \System\Cache\Driver {
/**
* All of the loaded cache items.
*
* @var array
*/
public $items = array();
/**
* Determine if an item exists in the cache.
*
@@ -43,7 +36,7 @@ class File implements \System\Cache\Driver {
return null;
}
return $this->items[$key] = unserialize(substr($cache, 10));
return unserialize(substr($cache, 10));
}
/**

22
system/cache/driver/memcached.php vendored
View File

@@ -1,13 +1,8 @@
<?php namespace System\Cache\Driver;
class Memcached implements \System\Cache\Driver {
use System\Config;
/**
* All of the loaded cache items.
*
* @var array
*/
public $items = array();
class Memcached implements \System\Cache\Driver {
/**
* Determine if an item exists in the cache.
@@ -28,14 +23,7 @@ class Memcached implements \System\Cache\Driver {
*/
public function get($key)
{
$cache = \System\Memcached::instance()->get(\System\Config::get('cache.key').$key);
if ($cache === false)
{
return null;
}
return $this->items[$key] = $cache;
return (($cache = \System\Memcached::instance()->get(Config::get('cache.key').$key)) !== false) ? $cache : null;
}
/**
@@ -48,7 +36,7 @@ class Memcached implements \System\Cache\Driver {
*/
public function put($key, $value, $minutes)
{
\System\Memcached::instance()->set(\System\Config::get('cache.key').$key, $value, 0, $minutes * 60);
\System\Memcached::instance()->set(Config::get('cache.key').$key, $value, 0, $minutes * 60);
}
/**
@@ -59,7 +47,7 @@ class Memcached implements \System\Cache\Driver {
*/
public function forget($key)
{
\System\Memcached::instance()->delete(\System\Config::get('cache.key').$key);
\System\Memcached::instance()->delete(Config::get('cache.key').$key);
}
}

29
system/cache/factory.php vendored
View File

@@ -1,29 +0,0 @@
<?php namespace System\Cache;
class Factory {
/**
* Create a cache driver instance.
*
* @param string $driver
* @return Driver
*/
public static function make($driver)
{
switch ($driver)
{
case 'file':
return new Driver\File;
case 'memcached':
return new Driver\Memcached;
case 'apc':
return new Driver\APC;
default:
throw new \Exception("Cache driver [$driver] is not supported.");
}
}
}