symfony · ewgRa · Jan 29, 2014 · sstok · Feb 23, 2014 · ewgRa
diff --git a/...SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php b/...SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php
@@ -19,6 +19,8 @@ class LocalizedController extends ContainerAware
 {
     public function loginAction()
     {
+        $this->container->get('request')->getSession()->start();
+
         // get the login error if there is one
         if ($this->container->get('request')->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
             $error = $this->container->get('request')->attributes->get(SecurityContext::AUTHENTICATION_ERROR);

diff --git a/...dle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php b/...dle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php
@@ -20,6 +20,8 @@ class LoginController extends ContainerAware
 {
     public function loginAction()
     {
+        $this->container->get('request')->getSession()->start();
+
         // get the login error if there is one
         if ($this->container->get('request')->attributes->has(SecurityContext::AUTHENTICATION_ERROR)) {
             $error = $this->container->get('request')->attributes->get(SecurityContext::AUTHENTICATION_ERROR);

diff --git a/src/Symfony/Component/HttpFoundation/Session/Session.php b/src/Symfony/Component/HttpFoundation/Session/Session.php
@@ -78,6 +78,10 @@ public function start()
      */
     public function has($name)
     {
+        if (!$this->isStarted() && !$this->storage->hasPreviousSession()) {
+            return false;
+        }
+
         return $this->storage->getBag($this->attributeName)->has($name);
     }
 
@@ -86,6 +90,10 @@ public function has($name)
      */
     public function get($name, $default = null)
     {
+        if (!$this->isStarted() && !$this->storage->hasPreviousSession()) {
+            return $default;
+        }
+
         return $this->storage->getBag($this->attributeName)->get($name, $default);
     }
 
@@ -102,6 +110,10 @@ public function set($name, $value)
      */
     public function all()
     {
+        if (!$this->isStarted() && !$this->storage->hasPreviousSession()) {
+            return array();
+        }
+
         return $this->storage->getBag($this->attributeName)->all();
     }
 
@@ -154,6 +166,10 @@ public function getIterator()
      */
     public function count()
     {
+        if (!$this->isStarted() && !$this->storage->hasPreviousSession()) {
+            return 0;
+        }
+
         return count($this->storage->getBag($this->attributeName)->all());
     }
 

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
@@ -215,6 +215,14 @@ public function isStarted()
         return $this->started;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasPreviousSession()
+    {
+        return !empty($this->id);
+    }
+
     /**
      * Sets the MetadataBag.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -316,6 +316,14 @@ public function isStarted()
         return $this->started;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function hasPreviousSession()
+    {
+        return isset($_COOKIE[session_name()]);
+    }
+
     /**
      * Sets session.* ini variables.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php b/src/Symfony/Component/HttpFoundation/Session/Storage/SessionStorageInterface.php
@@ -120,6 +120,13 @@ public function save();
      */
     public function clear();
 
+    /**
+     * Checks that storage has previous session
+     *
+     * @return boolean True if previous session exiting, false otherwise.
+     */
+    public function hasPreviousSession();
+
     /**
      * Gets a SessionBagInterface by name.
      *

diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/SessionTest.php
@@ -82,6 +82,7 @@ public function testGet()
         // tests defaults
         $this->assertNull($this->session->get('foo'));
         $this->assertEquals(1, $this->session->get('foo', 1));
+        $this->assertFalse($this->session->isStarted());
     }
 
     /**
@@ -91,13 +92,17 @@ public function testSet($key, $value)
     {
         $this->session->set($key, $value);
         $this->assertEquals($value, $this->session->get($key));
+        $this->assertTrue($this->session->isStarted());
     }
 
     /**
      * @dataProvider setProvider
      */
     public function testHas($key, $value)
     {
+        $this->assertFalse($this->session->has($key.'_lazy_start'));
+        $this->assertFalse($this->session->isStarted());
+
         $this->session->set($key, $value);
         $this->assertTrue($this->session->has($key));
         $this->assertFalse($this->session->has($key.'non_value'));
@@ -106,6 +111,7 @@ public function testHas($key, $value)
     public function testReplace()
     {
         $this->session->replace(array('happiness' => 'be good', 'symfony' => 'awesome'));
+        $this->assertTrue($this->session->isStarted());
         $this->assertEquals(array('happiness' => 'be good', 'symfony' => 'awesome'), $this->session->all());
         $this->session->replace(array());
         $this->assertEquals(array(), $this->session->all());
@@ -116,6 +122,10 @@ public function testReplace()
      */
     public function testAll($key, $value, $result)
     {
+        $this->assertEquals(array(), $this->session->all());
+        $this->session->all();
+        $this->assertFalse($this->session->isStarted());
+
         $this->session->set($key, $value);
         $this->assertEquals($result, $this->session->all());
     }
@@ -129,6 +139,7 @@ public function testClear($key, $value)
         $this->session->set($key, $value);
         $this->session->clear();
         $this->assertEquals(array(), $this->session->all());
+        $this->assertTrue($this->session->isStarted());
     }
 
     public function setProvider()
@@ -149,27 +160,31 @@ public function testRemove($key, $value)
         $this->session->set($key, $value);
         $this->session->remove($key);
         $this->assertEquals(array('hi.world' => 'have a nice day'), $this->session->all());
+        $this->assertTrue($this->session->isStarted());
     }
 
     public function testInvalidate()
     {
         $this->session->set('invalidate', 123);
         $this->session->invalidate();
         $this->assertEquals(array(), $this->session->all());
+        $this->assertTrue($this->session->isStarted());
     }
 
     public function testMigrate()
     {
         $this->session->set('migrate', 321);
         $this->session->migrate();
         $this->assertEquals(321, $this->session->get('migrate'));
+        $this->assertTrue($this->session->isStarted());
     }
 
     public function testMigrateDestroy()
     {
         $this->session->set('migrate', 333);
         $this->session->migrate(true);
         $this->assertEquals(333, $this->session->get('migrate'));
+        $this->assertTrue($this->session->isStarted());
     }
 
     public function testSave()
@@ -214,6 +229,9 @@ public function testGetIterator()
      */
     public function testGetCount()
     {
+        $this->assertEquals(0, count($this->session));
+        $this->assertFalse($this->session->isStarted());
+
         $this->session->set('hello', 'world');
         $this->session->set('symfony2', 'rocks');