Merge branch '3.4' into 4.4

* 3.4: Fix PHPUnit 8.5 deprecations.
symfony · Jul 23, 2020 · 3675676 · 3675676
2 parents 44f5147 + 5219dba
commit 3675676
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php
@@ -127,7 +127,7 @@ public function testGc()
      */
     public function testValidateId()
     {
-        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
         $mock->expects($this->once())
             ->method('validateId');
 
@@ -142,7 +142,7 @@ public function testValidateId()
      */
     public function testUpdateTimestamp()
     {
-        $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();
+        $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();
         $mock->expects($this->once())
             ->method('updateTimestamp')
             ->willReturn(false);
@@ -156,3 +156,7 @@ public function testUpdateTimestamp()
         $this->proxy->updateTimestamp('id', 'data');
     }
 }
+
+abstract class TestSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface
+{
+}