symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
+22Lines changed: 22 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
+22Lines changed: 22 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -19,6 +19,7 @@
 class StrictSessionHandler extends AbstractSessionHandler
 {
     private $handler;
+    private $newSessionId;
 
     public function __construct(\SessionHandlerInterface $handler)
     {
@@ -39,6 +40,17 @@ public function open($savePath, $sessionName)
         return $this->handler->open($savePath, $sessionName);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function read($sessionId)
+    {
+        $data = parent::read($sessionId);
+        $this->newSessionId = '' === $data ? $sessionId : null;
+
+        return $data;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -60,9 +72,19 @@ public function updateTimestamp($sessionId, $data)
      */
     protected function doWrite($sessionId, $data)
     {
+        $this->newSessionId = null;
+
         return $this->handler->write($sessionId, $data);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        return parent::destroy($sessionId) && ($this->newSessionId !== $sessionId || $this->doDestroy($sessionId));
+    }
+
     /**
      * {@inheritdoc}
      */
 
@@ -118,7 +118,7 @@ public function testWriteEmptyNewSession()
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
         $handler->expects($this->never())->method('write');
-        $handler->expects($this->never())->method('destroy');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
 
         $this->assertFalse($proxy->validateId('id'));
@@ -154,7 +154,7 @@ public function testDestroyNewSession()
         $handler = $this->getMockBuilder('SessionHandlerInterface')->getMock();
         $handler->expects($this->once())->method('read')
             ->with('id')->willReturn('');
-        $handler->expects($this->never())->method('destroy');
+        $handler->expects($this->once())->method('destroy')->willReturn(true);
         $proxy = new StrictSessionHandler($handler);
 
         $this->assertSame('', $proxy->read('id'));