diff options
| -rw-r--r-- | Core/Authentication/Token/TokenInterface.php | 6 | ||||
| -rw-r--r-- | Http/RememberMe/ResponseListener.php | 4 | ||||
| -rw-r--r-- | Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php | 4 | ||||
| -rw-r--r-- | Http/Tests/RememberMe/ResponseListenerTest.php | 19 | ||||
| -rw-r--r-- | composer.json | 2 |
5 files changed, 27 insertions, 8 deletions
diff --git a/Core/Authentication/Token/TokenInterface.php b/Core/Authentication/Token/TokenInterface.php index fb9fd14..be90802 100644 --- a/Core/Authentication/Token/TokenInterface.php +++ b/Core/Authentication/Token/TokenInterface.php @@ -47,8 +47,10 @@ interface TokenInterface extends \Serializable /** * Returns a user representation. * - * @return mixed either returns an object which implements __toString(), or - * a primitive string is returned. + * @return mixed Can be a UserInterface instance, an object implementing a __toString method, + * or the username as a regular string + * + * @see AbstractToken::setUser() */ public function getUser(); diff --git a/Http/RememberMe/ResponseListener.php b/Http/RememberMe/ResponseListener.php index 2253c5d..4149fb6 100644 --- a/Http/RememberMe/ResponseListener.php +++ b/Http/RememberMe/ResponseListener.php @@ -27,6 +27,10 @@ class ResponseListener implements EventSubscriberInterface */ public function onKernelResponse(FilterResponseEvent $event) { + if (!$event->isMasterRequest()) { + return; + } + $request = $event->getRequest(); $response = $event->getResponse(); diff --git a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php index 0f43aa0..3bc4eb6 100644 --- a/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php +++ b/Http/Tests/Firewall/AnonymousAuthenticationListenerTest.php @@ -73,10 +73,6 @@ class AnonymousAuthenticationListenerTest extends \PHPUnit_Framework_TestCase public function testHandledEventIsLogged() { - if (!interface_exists('Psr\Log\LoggerInterface')) { - $this->markTestSkipped('The "LoggerInterface" is not available'); - } - $context = $this->getMock('Symfony\Component\Security\Core\SecurityContextInterface'); $logger = $this->getMock('Psr\Log\LoggerInterface'); $logger->expects($this->once()) diff --git a/Http/Tests/RememberMe/ResponseListenerTest.php b/Http/Tests/RememberMe/ResponseListenerTest.php index 9bb84a2..78de8e4 100644 --- a/Http/Tests/RememberMe/ResponseListenerTest.php +++ b/Http/Tests/RememberMe/ResponseListenerTest.php @@ -11,6 +11,7 @@ namespace Symfony\Component\Security\Http\Tests\RememberMe; +use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\Security\Http\RememberMe\ResponseListener; use Symfony\Component\Security\Http\RememberMe\RememberMeServicesInterface; use Symfony\Component\HttpFoundation\Request; @@ -34,6 +35,21 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase $listener->onKernelResponse($this->getEvent($request, $response)); } + public function testRememberMeCookieIsNotSendWithResponseForSubRequests() + { + $cookie = new Cookie('rememberme'); + + $request = $this->getRequest(array( + RememberMeServicesInterface::COOKIE_ATTR_NAME => $cookie, + )); + + $response = $this->getResponse(); + $response->headers->expects($this->never())->method('setCookie'); + + $listener = new ResponseListener(); + $listener->onKernelResponse($this->getEvent($request, $response, HttpKernelInterface::SUB_REQUEST)); + } + public function testRememberMeCookieIsNotSendWithResponse() { $request = $this->getRequest(); @@ -71,13 +87,14 @@ class ResponseListenerTest extends \PHPUnit_Framework_TestCase return $response; } - private function getEvent($request, $response) + private function getEvent($request, $response, $type = HttpKernelInterface::MASTER_REQUEST) { $event = $this->getMockBuilder('Symfony\Component\HttpKernel\Event\FilterResponseEvent') ->disableOriginalConstructor() ->getMock(); $event->expects($this->any())->method('getRequest')->will($this->returnValue($request)); + $event->expects($this->any())->method('isMasterRequest')->will($this->returnValue($type === HttpKernelInterface::MASTER_REQUEST)); $event->expects($this->any())->method('getResponse')->will($this->returnValue($response)); return $event; diff --git a/composer.json b/composer.json index 4c4ce3e..c956411 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "symfony/security-http": "self.version" }, "require-dev": { - "symfony/locale": "~2.0,>=2.0.5", + "symfony/intl": "~2.3", "symfony/routing": "~2.2", "symfony/translation": "~2.0,>=2.0.5", "symfony/validator": "~2.5,>=2.5.5", |