Merge branch '5.4' into 6.0

xabbuh · xabbuh · commit 0eb382a3ecd7 · 2021-07-10T12:33:50.000+02:00
* 5.4:
  do not mock event classes
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/SessionListenerTest.php
@@ -82,9 +82,7 @@ public function testSessionUsesFactory()
         $request = new Request();
         $listener = new SessionListener($container);
 
-        $event = $this->createMock(RequestEvent::class);
-        $event->expects($this->exactly(2))->method('isMainRequest')->willReturn(true);
-        $event->expects($this->once())->method('getRequest')->willReturn($request);
+        $event = new RequestEvent($this->createMock(HttpKernelInterface::class), $request, HttpKernelInterface::MAIN_REQUEST);
 
         $listener->onKernelRequest($event);
 
