Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit c971a27f9ef0 · 2020-07-23T11:48:09.000+02:00
* 3.4:
  Fix PHPUnit 8.5 deprecations.
diff --git a/src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Proxy/SessionHandlerProxyTest.php b/src/Symfony/Component/HttpFoundation/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
+{
+}

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function testGc()`
`127`	`127`	`*/`
`128`	`128`	`public function testValidateId()`
`129`	`129`	`{`
`130`		`- $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();`
	`130`	`+ $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();`
`131`	`131`	`$mock->expects($this->once())`
`132`	`132`	`->method('validateId');`
`133`	`133`
`@@ -142,7 +142,7 @@ public function testValidateId()`
`142`	`142`	`*/`
`143`	`143`	`public function testUpdateTimestamp()`
`144`	`144`	`{`
`145`		`- $mock = $this->getMockBuilder(['SessionHandlerInterface', 'SessionUpdateTimestampHandlerInterface'])->getMock();`
	`145`	`+ $mock = $this->getMockBuilder(TestSessionHandler::class)->getMock();`
`146`	`146`	`$mock->expects($this->once())`< 74E1 /td>
`147`	`147`	`->method('updateTimestamp')`
`148`	`148`	`->willReturn(false);`
`@@ -156,3 +156,7 @@ public function testUpdateTimestamp()`
`156`	`156`	`$this->proxy->updateTimestamp('id', 'data');`
`157`	`157`	`}`
`158`	`158`	`}`
	`159`	`+`
	`160`	`+abstract class TestSessionHandler implements \SessionHandlerInterface, \SessionUpdateTimestampHandlerInterface`
	`161`	`+{`
	`162`	`+}`