bug #18018 [HttpFoundation] exception when registering bags for started sessions (xabbuh)

fabpot · fabpot · commit 5d8067f32d1a · 2016-03-08T22:59:00.000+01:00
This PR was merged into the 2.3 branch. Discussion ---------- [HttpFoundation] exception when registering bags for started sessions | Q | A | ------------- | --- | Branch | 2.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #10707, #16136 | License | MIT | Doc PR | Commits ------- c4a5b67 exception when registering bags for started sessions
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/Session/Storage/NativeSessionStorage.php
@@ -260,6 +260,10 @@ public function clear()
      */
     public function registerBag(SessionBagInterface $bag)
     {
+        if ($this->started) {
+            throw new \LogicException('Cannot register a bag when the session is already started.');
+        }
+
         $this->bags[$bag->getName()] = $bag;
     }
 
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php b/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/NativeSessionStorageTest.php
@@ -83,6 +83,16 @@ public function testRegisterBagException()
         $storage->getBag('non_existing');
     }
 
+    /**
+     * @expectedException \LogicException
+     */
+    public function testRegisterBagForAStartedSessionThrowsException()
+    {
+        $storage = $this->getStorage();
+        $storage->start();
+        $storage->registerBag(new AttributeBag());
+    }
+
     public function testGetId()
     {
         $storage = $this->getStorage();

Original file line number	Diff line number	Diff line change
`@@ -260,6 +260,10 @@ public function clear()`
`260`	`260`	`*/`
`261`	`261`	`public function registerBag(SessionBagInterface $bag)`
`262`	`262`	`{`
	`263`	`+ if ($this->started) {`
	`264`	`+ throw new \LogicException('Cannot register a bag when the session is already started.');`
	`265`	`+ }`
	`266`	`+`
`263`	`267`	`$this->bags[$bag->getName()] = $bag;`
`264`	`268`	`}`
`265`	`269`