Merge branch '3.4' into 4.4
* 3.4: Fix PHPUnit 8.5 deprecations.
This commit is contained in:
commit
c971a27f9e
|
@ -127,7 +127,7 @@ class SessionHandlerProxyTest extends TestCase
|
||||||
*/
|
*/
|
||||||
public function testValidateId()
|
public function testValidateId()
|
||||||
{
|
{
|
||||||
$mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
|
$mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
|
||||||
$mock->expects($this->once())
|
$mock->expects($this->once())
|
||||||
->method('validateId');
|
->method('validateId');
|
||||||
|
|
||||||
|
@ -142,7 +142,7 @@ class SessionHandlerProxyTest extends TestCase
|
||||||
*/
|
*/
|
||||||
public function testUpdateTimestamp()
|
public function testUpdateTimestamp()
|
||||||
{
|
{
|
||||||
$mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
|
$mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
|
||||||
$mock->expects($this->once())
|
$mock->expects($this->once())
|
||||||
->method('updateTimestamp')
|
->method('updateTimestamp')
|
||||||
->willReturn(false);
|
->willReturn(false);
|
||||||
|
@ -156,3 +156,7 @@ class SessionHandlerProxyTest extends TestCase
|
||||||
$this->proxy->updateTimestamp('id', 'data');
|
$this->proxy->updateTimestamp('id', 'data');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class TestSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
Reference in New Issue