[Session] added "delete" method to Session and NativeSessionStorage

parnas · parnas · commit 488bc8b22c76 · 2014-11-29T14:04:28.000+01:00
diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -167,6 +167,14 @@ public function invalidate($lifetime = null)
         return $this->migrate(true, $lifetime);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy()
+    {
+        return $this->storage->destroy();
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -209,6 +209,34 @@ public function regenerate($destroy = false, $lifetime = null)
         return session_regenerate_id($destroy);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy()
+    {
+        $this->clean();
+
+        if (ini_get("session.use_cookies")) {
+
+            if (headers_sent($file, $line)) {
+                throw new \RuntimeException(sprintf('Failed to destroy the session because headers have already been sent by "%s" at line %d.', $file, $line));
+            }
+
+            $params = session_get_cookie_params();
+            setcookie(session_name(), '', time() - 42000,
+                $params["path"], $params["domain"],
+                $params["secure"], $params["httponly"]
+            );
+        }
+
+        $ret = session_destroy();
+
+        $this->closed = true;
+        $this->started = false;
+
+        return $ret;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -230,13 +258,7 @@ public function save()
      */
     public function clear()
     {
-        // clear out the bags
-        foreach ($this->bags as $bag) {
-            $bag->clear();
-        }
-
-        // clear out the session
-        $_SESSION = array();
+        $this->clean();
 
         // reconnect the bags to the session
         $this->loadSession();
@@ -387,6 +409,20 @@ public function setSaveHandler($saveHandler = null)
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function clean()
+    {
+        // clear out the bags
+        foreach ($this->bags as $bag) {
+            $bag->clear();
+        }
+
+        // clear out the session
+        $_SESSION = array();
+    }
+
     /**
      * Load the session with attributes.
      *
