diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Nicolas Grekas 2021-02-25 18:36:22 +01:00
parent d978bea326
commit 5854d55aef
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/HttpKernel/EventListener/SessionListener.php
View File

@ -14,7 +14,7 @@ namespace Symfony\Component\HttpKernel\EventListener;
use Psr\Container\ContainerInterface; use Psr\Container\ContainerInterface;
use Symfony\Component\HttpFoundation\Session\SessionInterface; use Symfony\Component\HttpFoundation\Session\SessionInterface;
use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage; use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\Event\RequestEvent;
/** /**
* Sets the session in the request. * Sets the session in the request.
@ -34,7 +34,7 @@ class SessionListener extends AbstractSessionListener
parent::__construct($container, $debug); parent::__construct($container, $debug);
} }
public function onKernelRequest(GetResponseEvent $event) public function onKernelRequest(RequestEvent $event)
{ {
parent::onKernelRequest($event); parent::onKernelRequest($event);

14
src/Symfony/Component/Security/Http/Tests/Firewall/LogoutListenerTest.php
View File

@ -36,7 +36,7 @@ class LogoutListenerTest extends TestCase
$dispatcher = $this->getEventDispatcher(); $dispatcher = $this->getEventDispatcher();
[$listener, , $httpUtils, $options] = $this->getListener($dispatcher); [$listener, , $httpUtils, $options] = $this->getListener($dispatcher);
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$logoutEventDispatched = false; $logoutEventDispatched = false;
$dispatcher->addListener(LogoutEvent::class, function (LogoutEvent $event) use (&$logoutEventDispatched) { $dispatcher->addListener(LogoutEvent::class, function (LogoutEvent $event) use (&$logoutEventDispatched) {
@ -60,7 +60,7 @@ class LogoutListenerTest extends TestCase
[$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher, $tokenManager); [$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher, $tokenManager);
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$request->query->set('_csrf_token', 'token'); $request->query->set('_csrf_token', 'token');
@ -98,7 +98,7 @@ class LogoutListenerTest extends TestCase
$dispatcher = $this->getEventDispatcher(); $dispatcher = $this->getEventDispatcher();
[$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher); [$listener, $tokenStorage, $httpUtils, $options] = $this->getListener($dispatcher);
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$httpUtils->expects($this->once()) $httpUtils->expects($this->once())
->method('checkRequestPath') ->method('checkRequestPath')
@ -131,7 +131,7 @@ class LogoutListenerTest extends TestCase
[$listener, , $httpUtils, $options] = $this->getListener(); [$listener, , $httpUtils, $options] = $this->getListener();
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$httpUtils->expects($this->once()) $httpUtils->expects($this->once())
->method('checkRequestPath') ->method('checkRequestPath')
@ -148,7 +148,7 @@ class LogoutListenerTest extends TestCase
[$listener, , $httpUtils, $options] = $this->getListener(null, $tokenManager); [$listener, , $httpUtils, $options] = $this->getListener(null, $tokenManager);
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$request->query->set('_csrf_token', 'token'); $request->query->set('_csrf_token', 'token');
@ -179,7 +179,7 @@ class LogoutListenerTest extends TestCase
$token = $this->getToken(); $token = $this->getToken();
$tokenStorage->expects($this->any())->method('getToken')->willReturn($token); $tokenStorage->expects($this->any())->method('getToken')->willReturn($token);
[$event, $request] = $this->getGetResponseEvent(); [$event, $request] = $this->getRequestEvent();
$httpUtils->expects($this->once()) $httpUtils->expects($this->once())
->method('checkRequestPath') ->method('checkRequestPath')
@ -208,7 +208,7 @@ class LogoutListenerTest extends TestCase
return $this->createMock(TokenStorageInterface::class); return $this->createMock(TokenStorageInterface::class);
} }
private function getGetResponseEvent() private function getRequestEvent()
{ {
$event = $this->createMock(RequestEvent::class); $event = $this->createMock(RequestEvent::class);

20
src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
View File

@ -46,7 +46,7 @@ class RememberMeListenerTest extends TestCase
->method('setToken') ->method('setToken')
; ;
$this->assertNull($listener($this->getGetResponseEvent())); $this->assertNull($listener($this->getRequestEvent()));
} }
public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet() public function testOnCoreSecurityDoesNothingWhenNoCookieIsSet()
@ -65,7 +65,7 @@ class RememberMeListenerTest extends TestCase
->willReturn(null) ->willReturn(null)
; ;
$event = $this->getGetResponseEvent(); $event = $this->getRequestEvent();
$this->assertNull($listener($event)); $this->assertNull($listener($event));
} }
@ -100,7 +100,7 @@ class RememberMeListenerTest extends TestCase
->willThrowException($exception) ->willThrowException($exception)
; ;
$event = $this->getGetResponseEvent($request); $event = $this->getRequestEvent($request);
$listener($event); $listener($event);
} }
@ -135,7 +135,7 @@ class RememberMeListenerTest extends TestCase
->willThrowException($exception) ->willThrowException($exception)
; ;
$event = $this->getGetResponseEvent(); $event = $this->getRequestEvent();
$listener($event); $listener($event);
} }
@ -167,7 +167,7 @@ class RememberMeListenerTest extends TestCase
->method('authenticate') ->method('authenticate')
; ;
$event = $this->getGetResponseEvent(); $event = $this->getRequestEvent();
$listener($event); $listener($event);
} }
@ -201,7 +201,7 @@ class RememberMeListenerTest extends TestCase
->willReturn($token) ->willReturn($token)
; ;
$event = $this->getGetResponseEvent(); $event = $this->getRequestEvent();
$listener($event); $listener($event);
} }
@ -245,7 +245,7 @@ class RememberMeListenerTest extends TestCase
$request = new Request(); $request = new Request();
$request->setSession($session); $request->setSession($session);
$event = $this->getGetResponseEvent($request); $event = $this->getRequestEvent($request);
$sessionStrategy $sessionStrategy
->expects($this->once()) ->expects($this->once())
@ -299,7 +299,7 @@ class RememberMeListenerTest extends TestCase
$request = new Request(); $request = new Request();
$request->setSession($session); $request->setSession($session);
$event = $this->getGetResponseEvent($request); $event = $this->getRequestEvent($request);
$listener($event); $listener($event);
} }
@ -333,7 +333,7 @@ class RememberMeListenerTest extends TestCase
->willReturn($token) ->willReturn($token)
; ;
$event = $this->getGetResponseEvent(); $event = $this->getRequestEvent();
$dispatcher $dispatcher
->expects($this->once()) ->expects($this->once())
@ -347,7 +347,7 @@ class RememberMeListenerTest extends TestCase
$listener($event); $listener($event);
} }
protected function getGetResponseEvent(Request $request = null): RequestEvent protected function getRequestEvent(Request $request = null): RequestEvent
{ {
$request = $request ?? new Request(); $request = $request ?? new Request();