symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+25-1Lines changed: 25 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/MockArraySessionStorageTest.php
+25-1Lines changed: 25 additions & 1 deletion
@@ -123,7 +123,7 @@ public function getId()
      */
     public function setId($id)
     {
-        if ($this->started) {
+        if ($this->started && $this->id !== $id) {
             throw new \LogicException('Cannot set session ID after the session has started.');
         }
 
 
@@ -48,7 +48,7 @@ protected function setUp()
         $this->data = array(
             $this->attributes->getStorageKey() => array('foo' => 'bar'),
             $this->flashes->getStorageKey() => array('notice' => 'hello'),
-            );
+        );
 
         $this->storage = new MockArraySessionStorage();
         $this->storage->registerBag($this->flashes);
@@ -97,6 +97,30 @@ public function testGetId()
         $this->assertNotEquals('', $this->storage->getId());
     }
 
+    public function testSetId()
+    {
+        $this->storage->start();
+        $id = $this->storage->getId();
+
+        $exception = null;
+        try {
+            $this->storage->setId($id);
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertNull($exception);
+
+        $exception = null;
+        try {
+            $this->storage->setId('different');
+        } catch (\Exception $e) {
+            $exception = $e;
+        }
+
+        $this->assertInstanceOf('\LogicException', $exception);
+    }
+
     public function testClearClearsBags()
     {
         $this->storage->clear();
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function getId()`
`123`	`123`	`*/`
`124`	`124`	`public function setId($id)`
`125`	`125`	`{`
`126`		`- if ($this->started) {`
	`126`	`+ if ($this->started && $this->id !== $id) {`
`127`	`127`	`throw new \LogicException('Cannot set session ID after the session has started.');`
`128`	`128`	`}`
`129`	`129`