Remove dead code for emulating SameSite cookie

mbabker · mbabker · commit e0684a22e3b0 · 2021-05-29T09:39:39.000-05:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -54,11 +54,6 @@ class NativeSessionStorage implements SessionStorageInterface
      */
     protected $metadataBag;
 
-    /**
-     * @var string|null
-     */
-    private $emulateSameSite;
-
     /**
      * Depending on how you want the storage driver to behave you probably
      * want to override this constructor entirely.
@@ -157,13 +152,6 @@ public function start()
             throw new \RuntimeException('Failed to start the session.');
         }
 
-        if (null !== $this->emulateSameSite) {
-            $originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
-            if (null !== $originalCookie) {
-                header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
-            }
-        }
-
         $this->loadSession();
 
         return true;
@@ -225,16 +213,7 @@ public function regenerate(bool $destroy = false, int $lifetime = null)
             $this->metadataBag->stampNew();
         }
 
-        $isRegenerated = session_regenerate_id($destroy);
-
-        if (null !== $this->emulateSameSite) {
-            $originalCookie = SessionUtils::popSessionCookie(session_name(), session_id());
-            if (null !== $originalCookie) {
-                header(sprintf('%s; SameSite=%s', $originalCookie, $this->emulateSameSite), false);
-            }
-        }
-
-        return $isRegenerated;
+        return session_regenerate_id($destroy);
     }
 
     /**
