From 20bdfe4046e8fcab64376a60e390b87c5c3484e6 Mon Sep 17 00:00:00 2001 From: huangdijia Date: Tue, 26 Jan 2016 08:46:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=9F=E5=BC=83think/session/Driver.php?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/session/Driver.php | 25 ----------------------- library/think/session/driver/Memcache.php | 10 ++++++--- library/think/session/driver/Redis.php | 9 ++++++-- 3 files changed, 14 insertions(+), 30 deletions(-) delete mode 100644 library/think/session/Driver.php diff --git a/library/think/session/Driver.php b/library/think/session/Driver.php deleted file mode 100644 index 1311de8c..00000000 --- a/library/think/session/Driver.php +++ /dev/null @@ -1,25 +0,0 @@ - -// +---------------------------------------------------------------------- - -namespace think\session; - -use SessionHandler; - -class Driver extends SessionHandler -{ - protected $config = []; - - public function __construct($config = []) - { - $this->config = array_merge($this->config, $config); - } - -} diff --git a/library/think/session/driver/Memcache.php b/library/think/session/driver/Memcache.php index 30e897c9..c3c42d12 100644 --- a/library/think/session/driver/Memcache.php +++ b/library/think/session/driver/Memcache.php @@ -11,10 +11,9 @@ namespace think\session\driver; -use think\Config; -use think\session\Driver; +use SessionHandler; -class Memcache extends Driver +class Memcache extends SessionHandler { protected $handler = null; protected $config = [ @@ -26,6 +25,11 @@ class Memcache extends Driver 'session_name' => '', // memcache key前缀 ]; + public function __construct($config = []) + { + $this->config = array_merge($this->config, $config); + } + /** * 打开Session * @access public diff --git a/library/think/session/driver/Redis.php b/library/think/session/driver/Redis.php index d06886b2..b3e2121d 100644 --- a/library/think/session/driver/Redis.php +++ b/library/think/session/driver/Redis.php @@ -12,9 +12,9 @@ namespace think\session\driver; use think\Config; -use think\session\Driver; +use SessionHandler; -class Redis extends Driver +class Redis extends SessionHandler { protected $handler = null; protected $config = [ @@ -27,6 +27,11 @@ class Redis extends Driver 'session_name' => '', // memcache key前缀 ]; + public function __construct($config = []) + { + $this->config = array_merge($this->config, $config); + } + /** * 打开Session * @access public