symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Session/Storage/Handler/StrictSessionHandler.php
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/StrictSessionHandlerTest.php
Lines changed: 2 additions & 2 deletions
@@ -19,6 +19,7 @@
 class StrictSessionHandler extends AbstractSessionHandler
 {
     private $handler;
+    private $doDestroy;
 
     public function __construct(\SessionHandlerInterface $handler)
     {
@@ -63,11 +64,24 @@ protected function doWrite($sessionId, $data)
         return $this->handler->write($sessionId, $data);
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function destroy($sessionId)
+    {
+        $this->doDestroy = true;
+        $destroyed = parent::destroy($sessionId);
+
+        return $this->doDestroy ? $this->doDestroy($sessionId) : $destroyed;
+    }
+
     /**
      * {@inheritdoc}
      */
     protected function doDestroy($sessionId)
     {
+        $this->doDestroy = false;
+
         return $this->handler->destroy($sessionId);
     }
 
 
@@ -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'));
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`class StrictSessionHandler extends AbstractSessionHandler`
`20`	`20`	`{`
`21`	`21`	`private $handler;`
	`22`	`+ private $doDestroy;`
`22`	`23`
`23`	`24`	`public function __construct(\SessionHandlerInterface $handler)`
`24`	`25`	`{`
`@@ -63,11 +64,24 @@ protected function doWrite($sessionId, $data)`
`63`	`64`	`return $this->handler->write($sessionId, $data);`
`64`	`65`	`}`
`65`	`66`
	`67`	`+ /**`
	`68`	`+ * {@inheritdoc}`
	`69`	`+ */`
	`70`	`+ public function destroy($sessionId)`
	`71`	`+ {`
	`72`	`+ $this->doDestroy = true;`
	`73`	`+ $destroyed = parent::destroy($sessionId);`
	`74`	`+`
	`75`	`+ return $this->doDestroy ? $this->doDestroy($sessionId) : $destroyed;`
	`76`	`+ }`
	`77`	`+`
`66`	`78`	`/**`
`67`	`79`	`* {@inheritdoc}`
`68`	`80`	`*/`
`69`	`81`	`protected function doDestroy($sessionId)`
`70`	`82`	`{`
	`83`	`+ $this->doDestroy = false;`
	`84`	`+`
`71`	`85`	`return $this->handler->destroy($sessionId);`
`72`	`86`	`}`
`73`	`87`