Added back setRememberMeInactive and replaced

dotkernel · Feb 8, 2023 · 679d95f · 679d95f
1 parent 8b6df5f
commit 679d95f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "~8.1.0",
+        "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
         "psr/http-message": "^1.0.1",
         "laminas/laminas-servicemanager": "^3.11.1",
         "laminas/laminas-session": "^2.12.1",

diff --git a/src/ConfigProvider.php b/src/ConfigProvider.php
@@ -9,7 +9,6 @@
 
 namespace Dot\Session;
 
-use Dot\Session\Factory\AutoLoginMiddlewareFactory;
 use Dot\Session\Factory\ContainerAbstractServiceFactory;
 use Dot\Session\Factory\SessionMiddlewareFactory;
 use Dot\Session\Factory\SessionOptionsFactory;

diff --git a/src/Options/SessionOptions.php b/src/Options/SessionOptions.php
@@ -27,4 +27,12 @@ public function getRememberMeInactive(): int
     {
         return $this->rememberMeInactive;
     }
+
+    /**
+     * @param int $rememberMeInactive
+     */
+    public function setRememberMeInactive(int $rememberMeInactive)
+    {
+        $this->rememberMeInactive = $rememberMeInactive;
+    }
 }
diff --git a/src/SessionMiddleware.php b/src/SessionMiddleware.php
@@ -53,13 +53,13 @@ public function __construct(
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         $now = time();
-        if (isset($_SESSION['LAST_ACTIVITY'])
-            && $now - $_SESSION['LAST_ACTIVITY'] > $this->options->getRememberMeInactive()
+        if (isset($this->defaultSessionManager->getStorage()['LAST_ACTIVITY'])
+            && $now - $this->defaultSessionManager->getStorage()['LAST_ACTIVITY'] > $this->options->getRememberMeInactive()
         ) {
             $this->defaultSessionManager->destroy(['send_expire_cookie' => true, 'clear_storage' => true]);
             $this->defaultSessionManager->start();
         }
-        $_SESSION['LAST_ACTIVITY'] = $now;
+        $this->defaultSessionManager->getStorage()['LAST_ACTIVITY'] = $now;
         return $handler->handle($request);
     }
 }