From 7fd8435d110a5ff27b5c61d7151497c59b89a9ed Mon Sep 17 00:00:00 2001
From: rosier <rosier@interstroom.nl>
Date: Mon, 30 Mar 2020 19:57:25 +0200
Subject: [PATCH 1/2] No need to reconnect the bags to the session

Bug https://bugs.php.net/70013 was fixed before the release of PHP v7.0
---
 Session/Storage/NativeSessionStorage.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
index 5165b5d0d..d6ce2a79d 100644
--- a/Session/Storage/NativeSessionStorage.php
+++ b/Session/Storage/NativeSessionStorage.php
@@ -223,10 +223,6 @@ public function regenerate($destroy = false, $lifetime = null)
 
         $isRegenerated = session_regenerate_id($destroy);
 
-        // The reference to $_SESSION in session bags is lost in PHP7 and we need to re-create it.
-        // @see https://bugs.php.net/70013
-        $this->loadSession();
-
         if (null !== $this->emulateSameSite) {
             $originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
             if (null !== $originalCookie) {

From 9a692b69b244685bcb420c346736f6628bb79ace Mon Sep 17 00:00:00 2001
From: Guite <info@guite.de>
Date: Sun, 9 Feb 2020 17:51:23 +0100
Subject: [PATCH 2/2] [HttpFoundation] Fixed session migration with custom
 cookie lifetime

---
 Session/Storage/NativeSessionStorage.php           |  8 +++++---
 Tests/Session/Storage/NativeSessionStorageTest.php | 13 +++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/Session/Storage/NativeSessionStorage.php b/Session/Storage/NativeSessionStorage.php
index 7502897a4..66343cd31 100644
--- a/Session/Storage/NativeSessionStorage.php
+++ b/Session/Storage/NativeSessionStorage.php
@@ -152,7 +152,7 @@ public function start()
 
         // ok to try and start the session
         if (!session_start()) {
-            throw new \RuntimeException('Failed to start the session');
+            throw new \RuntimeException('Failed to start the session.');
         }
 
         if (null !== $this->emulateSameSite) {
@@ -213,8 +213,10 @@ public function regenerate($destroy = false, $lifetime = null)
             return false;
         }
 
-        if (null !== $lifetime) {
+        if (null !== $lifetime && $lifetime != ini_get('session.cookie_lifetime')) {
+            $this->save();
             ini_set('session.cookie_lifetime', $lifetime);
+            $this->start();
         }
 
         if ($destroy) {
@@ -314,7 +316,7 @@ public function registerBag(SessionBagInterface $bag)
     public function getBag($name)
     {
         if (!isset($this->bags[$name])) {
-            throw new \InvalidArgumentException(sprintf('The SessionBagInterface %s is not registered.', $name));
+            throw new \InvalidArgumentException(sprintf('The SessionBagInterface "%s" is not registered.', $name));
         }
 
         if (!$this->started && $this->saveHandler->isActive()) {
diff --git a/Tests/Session/Storage/NativeSessionStorageTest.php b/Tests/Session/Storage/NativeSessionStorageTest.php
index d2cf32452..7cfcd223e 100644
--- a/Tests/Session/Storage/NativeSessionStorageTest.php
+++ b/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -123,6 +123,19 @@ public function testRegenerateDestroy()
         $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
     }
 
+    public function testRegenerateWithCustomLifetime()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $id = $storage->getId();
+        $lifetime = 999999;
+        $storage->getBag('attributes')->set('legs', 11);
+        $storage->regenerate(false, $lifetime);
+        $this->assertNotEquals($id, $storage->getId());
+        $this->assertEquals(11, $storage->getBag('attributes')->get('legs'));
+        $this->assertEquals($lifetime, ini_get('session.cookie_lifetime'));
+    }
+
     public function testSessionGlobalIsUpToDateAfterIdRegeneration()
     {
         $storage = $this->getStorage();