Merge branch 'master' of github.com:swoft-cloud/swoft-component

src/Handler/FileSessionHandler.php

@@ -9,40 +9,35 @@
 
 
 /**
+ * Class FileSessionHandler
+ *
  * @Bean()
- * @uses      FileSessionHandler
- * @version   2017年12月05日
- * @author    huangzhhui <[email protected]>
- * @copyright Copyright 2010-2017 Swoft software
- * @license   PHP Version 7.x {@link http://www.php.net/license/3_0.txt}
+ * @package Swoft\Session\Handler
  */
-class FileSessionHandler implements \SessionHandlerInterface
+class FileSessionHandler implements \SessionHandlerInterface, LifetimeInterface
 {
 
+    use LifetimeTrait;
+
     /**
      * @var string
      */
     private $path;
 
-    /**
-     * @var int
-     */
-    private $minutes;
-
     /**
      * FileSessionHandler constructor.
      *
      * @param string $path
-     * @param int    $minutes
+     * @param int    $lifetime
      */
-    public function __construct($path = null, $minutes = 15)
+    public function __construct($path = null, $lifetime = 15 * 60)
     {
         if (null !== $path) {
             $this->path = $path;
         } else {
             $this->path = App::getAlias('@runtime/sessions');
         }
-        $this->minutes = $minutes;
+        $this->setLifetime($lifetime);
     }
 
     /**
@@ -85,7 +80,7 @@ public function read($sessionId)
     {
         $path = $this->path . '/' . $sessionId;
         if (file_exists($path)) {
-            if (filemtime($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
+            if (filemtime($path) >= Carbon::now()->subSeconds($this->getLifetime())->getTimestamp()) {
                 return file_get_contents($path);
             }
         }

src/Handler/LifetimeInterface.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Swoft\Session\Handler;
+
+
+interface LifetimeInterface
+{
+
+    /**
+     * @param int $seconds
+     * @return $this
+     */
+    public function setLifetime(int $seconds);
+
+    /**
+     * @return int
+     */
+    public function getLifetime(): int;
+
+}

src/Handler/LifetimeTrait.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Swoft\Session\Handler;
+
+
+trait LifetimeTrait
+{
+
+    /**
+     * @var int
+     */
+    protected $lifetime = 0;
+
+    /**
+     * @param int $seconds
+     * @return $this
+     */
+    public function setLifetime(int $seconds)
+    {
+        $this->lifetime = $seconds;
+        return $this;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLifetime(): int
+    {
+        return $this->lifetime;
+    }
+
+}

src/Handler/NeedRequestInterface.php

@@ -5,11 +5,9 @@
 use Swoft\Http\Message\Server\Request;
 
 /**
- * @uses      NeedRequestInterface
- * @version   2018年02月01日
- * @author    huangzhhui <[email protected]>
- * @copyright Copyright 2010-2018 Swoft software
- * @license   PHP Version 7.x {@link http://www.php.net/license/3_0.txt}
+ * Interface NeedRequestInterface
+ *
+ * @package Swoft\Session\Handler
  */
 interface NeedRequestInterface
 {

src/Handler/RedisSessionHandler.php

@@ -7,16 +7,16 @@
 
 
 /**
+ * Class RedisSessionHandler
+ *
  * @Bean()
- * @uses      RedisSessionHandler
- * @version   2017年12月05日
- * @author    huangzhhui <[email protected]>
- * @copyright Copyright 2010-2017 Swoft software
- * @license   PHP Version 7.x {@link http://www.php.net/license/3_0.txt}
+ * @package Swoft\Session\Handler
  */
-class RedisSessionHandler implements \SessionHandlerInterface
+class RedisSessionHandler implements \SessionHandlerInterface, LifetimeInterface
 {
 
+    use LifetimeTrait;
+
     /**
      * @var string
      */
@@ -27,11 +27,6 @@ class RedisSessionHandler implements \SessionHandlerInterface
      */
     private $glue = ':';
 
-    /**
-     * @var int
-     */
-    private $minutes;
-
     /**
      * @Inject()
      * @var \Swoft\Redis\Redis
@@ -41,11 +36,11 @@ class RedisSessionHandler implements \SessionHandlerInterface
     /**
      * RedisSessionHandler constructor.
      *
-     * @param int $minutes
+     * @param int $lifetime
      */
-    public function __construct($minutes = 15)
+    public function __construct($lifetime = 15 * 60)
     {
-        $this->minutes = $minutes;
+        $this->setLifetime($lifetime);
     }
 
     /**
@@ -94,7 +89,7 @@ public function read($sessionId)
      */
     public function write($sessionId, $data)
     {
-        return (bool)$this->redis->set($this->key($sessionId), $this->serialize($data));
+        return (bool)$this->redis->set($this->key($sessionId), $this->serialize($data), $this->getLifetime());
     }
 
     /**

src/SessionManager.php

@@ -6,6 +6,7 @@
 use Swoft\Bean\Annotation\Bean;
 use Swoft\Bean\Annotation\Scope;
 use Swoft\Session\Handler\FileSessionHandler;
+use Swoft\Session\Handler\LifetimeInterface;
 use Swoft\Session\Handler\RedisSessionHandler;
 
 /**
@@ -42,10 +43,11 @@ class SessionManager
      */
     public function createHandlerByConfig(): \SessionHandlerInterface
     {
-        if (!isset($this->config['driver'])) {
+        if (!isset($this->getConfig()['driver'])) {
             throw new \InvalidArgumentException('Session driver required');
         }
-        $handler = $this->getHandler($this->config['driver']);
+        $handler = $this->getHandler($this->getConfig()['driver']);
+        $handler instanceof LifetimeInterface && $handler->setLifetime($this->getConfig()['lifetime']);
         return $handler;
     }
 
@@ -60,8 +62,7 @@ public function getHandler(string $name): \SessionHandlerInterface
     {
         $name = strtolower($name);
         $this->isValidate($name);
-        $class = $this->handlers[$name];
-        return App::getBean($class);
+        return App::getBean($this->handlers[$name]);
     }
 
     /**