[HttpKernel] fix merge

This commit is contained in:
Nicolas Grekas 2020-11-02 17:05:56 +01:00
parent 5831ab2b62
commit 76c19393c8

View File

@ -20,7 +20,6 @@ use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\Session\Session; use Symfony\Component\HttpFoundation\Session\Session;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpKernel\Event\FinishRequestEvent; use Symfony\Component\HttpKernel\Event\FinishRequestEvent;
use Symfony\Component\HttpKernel\Event\GetResponseEvent;
use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\Event\RequestEvent;
use Symfony\Component\HttpKernel\Event\ResponseEvent; use Symfony\Component\HttpKernel\Event\ResponseEvent;
use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener; use Symfony\Component\HttpKernel\EventListener\AbstractSessionListener;
@ -199,7 +198,7 @@ class SessionListenerTest extends TestCase
$container->set('session', $session); $container->set('session', $session);
$container->set('request_stack', $requestStack); $container->set('request_stack', $requestStack);
$event = new GetResponseEvent($kernel, $masterRequest, HttpKernelInterface::MASTER_REQUEST); $event = new RequestEvent($kernel, $masterRequest, HttpKernelInterface::MASTER_REQUEST);
$listener = new SessionListener($container); $listener = new SessionListener($container);
$listener->onKernelRequest($event); $listener->onKernelRequest($event);