symfony · fabpot · Jul 1, 2012 · Jun 9, 2012 · fabpot · Jul 1, 2012
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -518,7 +518,7 @@ public function hasPreviousSession()
      */
     public function hasSession()
     {
-        return null !== $this->session;
+        return null !== $this->session && $this->session->isStarted();
     }
 
     /**

diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -130,6 +130,14 @@ public function clear()
         $this->storage->getBag($this->attributeName)->clear();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function isStarted()
+    {
+        return $this->storage->isStarted();
+    }
+
     /**
      * Returns an iterator for attributes.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php b/src/Symfony/Component/HttpFoundation/Session/SessionInterface.php
@@ -174,6 +174,15 @@ function remove($name);
      */
     function clear();
 
+    /**
+     * Check if a session was started
+     *
+     * @api
+     *
+     * @return boolean
+     */
+    public function isStarted();
+
     /**
      * Registers a SessionBagInterface with the session.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -199,6 +199,16 @@ public function getBag($name)
         return $this->bags[$name];
     }
 
+    /**
+     * Check if the session was started or not
+     *
+     * @return boolean
+     */
+    public function isStarted()
+    {
+        return $this->started;
+    }
+
     /**
      * Sets the MetadataBag.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -289,6 +289,16 @@ public function getMetadataBag()
         return $this->metadataBag;
     }
 
+    /**
+     * Check if the session was started or not
+     *
+     * @return boolean
+     */
+    public function isStarted()
+    {
+        return $this->started;
+    }
+
     /**
      * Sets session.* ini variables.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
@@ -884,6 +884,7 @@ public function testHasSession()
 
         $this->assertFalse($request->hasSession());
         $request->setSession(new Session(new MockArraySessionStorage()));
+        $request->getSession()->start();
         $this->assertTrue($request->hasSession());
     }
 
@@ -895,6 +896,7 @@ public function testHasPreviousSession()
         $request->cookies->set('MOCKSESSID', 'foo');
         $this->assertFalse($request->hasPreviousSession());
         $request->setSession(new Session(new MockArraySessionStorage()));
+        $request->getSession()->start();
         $this->assertTrue($request->hasPreviousSession());
     }
 

diff --git a/src/Symfony/Component/Security/Tests/Http/Firewall/ContextListenerTest.php b/src/Symfony/Component/Security/Tests/Http/Firewall/ContextListenerTest.php
@@ -85,6 +85,7 @@ public function testOnKernelResponseWillRemoveSession()
     protected function runSessionOnKernelResponse($newToken, $original = null)
     {
         $session = new Session(new MockArraySessionStorage());
+        $session->start();
 
         if ($original !== null) {
             $session->set('_security_session', $original);
-Original file line number
+Diff line change
@@ Expand Up / @@ -518,7 +518,7 @@ public function hasPreviousSession() @@
          */
         public function hasSession()
         {
-            return null !== $this->session;
+            return null !== $this->session && $this->session->isStarted();
         }
         /**
@@ Expand Down @@