[HttpFoundation] fix registration of session proxies
This commit is contained in:
parent
af00528ff3
commit
5ed40c095b
@ -411,8 +411,6 @@ class NativeSessionStorage implements SessionStorageInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($this->saveHandler instanceof SessionHandlerProxy) {
|
if ($this->saveHandler instanceof SessionHandlerProxy) {
|
||||||
session_set_save_handler($this->saveHandler->getHandler(), false);
|
|
||||||
} elseif ($this->saveHandler instanceof \SessionHandlerInterface) {
|
|
||||||
session_set_save_handler($this->saveHandler, false);
|
session_set_save_handler($this->saveHandler, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,7 @@ namespace Symfony\Component\HttpFoundation\Session\Storage\Proxy;
|
|||||||
/**
|
/**
|
||||||
* @author Drak <drak@zikula.org>
|
* @author Drak <drak@zikula.org>
|
||||||
*/
|
*/
|
||||||
class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface
|
class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
|
||||||
{
|
{
|
||||||
protected $handler;
|
protected $handler;
|
||||||
|
|
||||||
@ -82,4 +82,20 @@ class SessionHandlerProxy extends AbstractProxy implements \SessionHandlerInterf
|
|||||||
{
|
{
|
||||||
return (bool) $this->handler->gc($maxlifetime);
|
return (bool) $this->handler->gc($maxlifetime);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public function validateId($sessionId)
|
||||||
|
{
|
||||||
|
return !$this->handler instanceof \SessionUpdateTimestampHandlerInterface || $this->handler->validateId($sessionId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@inheritdoc}
|
||||||
|
*/
|
||||||
|
public function updateTimestamp($sessionId, $data)
|
||||||
|
{
|
||||||
|
return $this->handler instanceof \SessionUpdateTimestampHandlerInterface ? $this->handler->updateTimestamp($sessionId, $data) : $this->write($sessionId, $data);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -121,4 +121,37 @@ class SessionHandlerProxyTest extends TestCase
|
|||||||
|
|
||||||
$this->proxy->gc(86400);
|
$this->proxy->gc(86400);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHPUnit 5.1
|
||||||
|
*/
|
||||||
|
public function testValidateId()
|
||||||
|
{
|
||||||
|
$mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
|
||||||
|
$mock->expects($this->once())
|
||||||
|
->method('validateId');
|
||||||
|
|
||||||
|
$proxy = new SessionHandlerProxy($mock);
|
||||||
|
$proxy->validateId('id');
|
||||||
|
|
||||||
|
$this->assertTrue($this->proxy->validateId('id'));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @requires PHPUnit 5.1
|
||||||
|
*/
|
||||||
|
public function testUpdateTimestamp()
|
||||||
|
{
|
||||||
|
$mock = $this->getMockBuilder(array('SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'))->getMock();
|
||||||
|
$mock->expects($this->once())
|
||||||
|
->method('updateTimestamp');
|
||||||
|
|
||||||
|
$proxy = new SessionHandlerProxy($mock);
|
||||||
|
$proxy->updateTimestamp('id', 'data');
|
||||||
|
|
||||||
|
$this->mock->expects($this->once())
|
||||||
|
->method('write');
|
||||||
|
|
||||||
|
$this->proxy->updateTimestamp('id', 'data');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user