Merge pull request #24 from Federkun/use-lifetime-from-php-setting

Use `session.cookie_lifetime` value when creating the session cookie.
zendframework · Sep 12, 2018 · f7617be · f7617be
2 parents 8aa9be0 + 6ce9805
commit f7617be
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/src/PhpSessionPersistence.php b/src/PhpSessionPersistence.php
@@ -115,6 +115,10 @@ public function persistSession(SessionInterface $session, ResponseInterface $res
                 ->withValue($this->cookie)
                 ->withPath(ini_get('session.cookie_path'));
 
+            if ($cookieLifetime = (int) ini_get('session.cookie_lifetime')) {
+                $sessionCookie = $sessionCookie->withExpires(time() + $cookieLifetime);
+            }
+
             $response = FigResponseCookies::set($response, $sessionCookie);
 
             if (! $this->cacheLimiter || $this->responseAlreadyHasCacheHeaders($response)) {

diff --git a/test/PhpSessionPersistenceTest.php b/test/PhpSessionPersistenceTest.php
@@ -442,4 +442,45 @@ public function testCookiesSetWithoutRegenerate()
 
         $this->assertNotEmpty($response->getHeaderLine('Set-Cookie'));
     }
+
+    public function testCookiesSetWithDefaultLifetime()
+    {
+        $persistence = new PhpSessionPersistence();
+        $request = new ServerRequest();
+        $session = $persistence->initializeSessionFromRequest($request);
+
+        $session->set('foo', 'bar');
+
+        $response = $persistence->persistSession($session, new Response());
+
+        $setCookie = FigResponseCookies::get($response, session_name());
+
+        $this->assertNotEmpty($response->getHeaderLine('Set-Cookie'));
+        $this->assertInstanceOf(SetCookie::class, $setCookie);
+        $this->assertSame(0, $setCookie->getExpires());
+    }
+
+    public function testCookiesSetWithCustomLifetime()
+    {
+        $lifetime = 300;
+        $expectedTimestamp = time() + $lifetime;
+
+        $ini = $this->applyCustomSessionOptions([
+            'cookie_lifetime' => $lifetime,
+        ]);
+
+        $persistence = new PhpSessionPersistence();
+        $request = new ServerRequest();
+        $session = $persistence->initializeSessionFromRequest($request);
+
+        $session->set('foo', 'bar');
+
+        $response = $persistence->persistSession($session, new Response());
+
+        $setCookie = FigResponseCookies::get($response, session_name());
+        $this->assertInstanceOf(SetCookie::class, $setCookie);
+        $this->assertSame($expectedTimestamp, $setCookie->getExpires());
+
+        $this->restoreOriginalSessionIniSettings($ini);
+    }
 }