Skip to content

Commit ce6e0a5

Browse files
Merge branch '5.4' into 6.0
* 5.4: [DoctrineBridge] Treat firstResult === 0 like null [Translation] Refresh local translations if the provider has domains [HttpKernel] Fix SessionListener without session in request #46268 [Notifier] Allow symfony/mercure 0.6 in Mercure bridge
2 parents 6548626 + b7ee4af commit ce6e0a5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Firewall/ContextListenerTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,10 +339,10 @@ public function testOnKernelResponseRemoveListener()
339339
$listener = new ContextListener($tokenStorage, [], 'session', null, $dispatcher, null, \Closure::fromCallable([$tokenStorage, 'getToken']));
340340
$this->assertEmpty($dispatcher->getListeners());
341341

342-
$listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST));
342+
$listener(new RequestEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST));
343343
$this->assertNotEmpty($dispatcher->getListeners());
344344

345-
$listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MASTER_REQUEST, new Response()));
345+
$listener->onKernelResponse(new ResponseEvent($httpKernel, $request, HttpKernelInterface::MAIN_REQUEST, new Response()));
346346
$this->assertEmpty($dispatcher->getListeners());
347347
}
348348

0 commit comments

Comments
 (0)