PSR规范调整

This commit is contained in:
thinkphp
2015-10-04 13:05:15 +08:00
parent 1cfb3704c6
commit 27e724bb3c
135 changed files with 9426 additions and 11556 deletions

View File

@@ -10,41 +10,44 @@
// +----------------------------------------------------------------------
namespace think\cache\driver;
use think\Exception;
/**
* Redis缓存驱动
* Redis缓存驱动
* 要求安装phpredis扩展https://github.com/nicolasff/phpredis
* @author 尘缘 <130775@qq.com>
*/
class Redis {
protected $handler = null;
protected $options = [
'host' => '127.0.0.1',
'port' => 6379,
'timeout' => false,
'expire' => 0,
'persistent' => false,
'length' => 0,
class Redis
{
protected $handler = null;
protected $options = [
'host' => '127.0.0.1',
'port' => 6379,
'timeout' => false,
'expire' => 0,
'persistent' => false,
'length' => 0,
];
/**
* 架构函数
/**
* 架构函数
* @param array $options 缓存参数
* @access public
*/
public function __construct($options=[]) {
if ( !extension_loaded('redis') ) {
public function __construct($options = [])
{
if (!extension_loaded('redis')) {
throw new Exception('_NOT_SUPPERT_:redis');
}
if(!empty($options)) {
$this->options = array_merge($this->options,$options);
if (!empty($options)) {
$this->options = array_merge($this->options, $options);
}
$func = $options['persistent'] ? 'pconnect' : 'connect';
$this->handler = new \Redis;
$options['timeout'] === false ?
$this->handler->$func($options['host'], $options['port']) :
$this->handler->$func($options['host'], $options['port'], $options['timeout']);
$func = $options['persistent'] ? 'pconnect' : 'connect';
$this->handler = new \Redis;
false === $options['timeout'] ?
$this->handler->$func($options['host'], $options['port']) :
$this->handler->$func($options['host'], $options['port'], $options['timeout']);
}
/**
@@ -53,8 +56,9 @@ class Redis {
* @param string $name 缓存变量名
* @return mixed
*/
public function get($name) {
return $this->handler->get($this->options['prefix'].$name);
public function get($name)
{
return $this->handler->get($this->options['prefix'] . $name);
}
/**
@@ -65,27 +69,31 @@ class Redis {
* @param integer $expire 有效时间(秒)
* @return boolen
*/
public function set($name, $value, $expire = null) {
if(is_null($expire)) {
$expire = $this->options['expire'];
public function set($name, $value, $expire = null)
{
if (is_null($expire)) {
$expire = $this->options['expire'];
}
$name = $this->options['prefix'].$name;
if(is_int($expire)) {
$name = $this->options['prefix'] . $name;
if (is_int($expire)) {
$result = $this->handler->setex($name, $expire, $value);
}else{
} else {
$result = $this->handler->set($name, $value);
}
if($result && $this->options['length']>0) {
if($this->options['length']>0) {
if ($result && $this->options['length'] > 0) {
if ($this->options['length'] > 0) {
// 记录缓存队列
$queue = $this->handler->get('__info__');
if(!$queue) {
$queue = [];
$queue = $this->handler->get('__info__');
if (!$queue) {
$queue = [];
}
if(false===array_search($name, $queue)) array_push($queue,$name);
if(count($queue) > $this->options['length']) {
if (false === array_search($name, $queue)) {
array_push($queue, $name);
}
if (count($queue) > $this->options['length']) {
// 出列
$key = array_shift($queue);
$key = array_shift($queue);
// 删除缓存
$this->handler->delete($key);
}
@@ -101,8 +109,9 @@ class Redis {
* @param string $name 缓存变量名
* @return boolen
*/
public function rm($name) {
return $this->handler->delete($this->options['prefix'].$name);
public function rm($name)
{
return $this->handler->delete($this->options['prefix'] . $name);
}
/**
@@ -110,7 +119,8 @@ class Redis {
* @access public
* @return boolen
*/
public function clear() {
public function clear()
{
return $this->handler->flushDB();
}