Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 16dfa5acf810 · 2021-01-27T12:19:04.000+01:00
* 5.1:
  More cleanups and fixes
diff --git a/Tests/Session/Storage/Handler/MarshallingSessionHandlerTest.php b/Tests/Session/Storage/Handler/MarshallingSessionHandlerTest.php
@@ -34,8 +34,8 @@ class MarshallingSessionHandlerTest extends TestCase
 
     protected function setUp(): void
     {
-        $this->marshaller = $this->getMockBuilder(MarshallerInterface::class)->getMock();
-        $this->handler = $this->getMockBuilder(AbstractSessionHandler::class)->getMock();
+        $this->marshaller = $this->createMock(MarshallerInterface::class);
+        $this->handler = $this->createMock(AbstractSessionHandler::class);
     }
 
     public function testOpen()

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,8 @@ class MarshallingSessionHandlerTest extends TestCase`
`34`	`34`
`35`	`35`	`protected function setUp(): void`
`36`	`36`	`{`
`37`		`- $this->marshaller = $this->getMockBuilder(MarshallerInterface::class)->getMock();`
`38`		`- $this->handler = $this->getMockBuilder(AbstractSessionHandler::class)->getMock();`
	`37`	`+ $this->marshaller = $this->createMock(MarshallerInterface::class);`
	`38`	`+ $this->handler = $this->createMock(AbstractSessionHandler::class);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function testOpen()`