Merge branch '2.3' into 2.5

* 2.3:
  adapted previous commit for 2.3
  [Security] Don't send remember cookie for sub request
  [HttpKernel] Fix UriSigner::check when _hash is not at the end of the uri

Conflicts:
	src/Symfony/Component/Security/Http/Tests/RememberMe/ResponseListenerTest.php

1 files changed, 18 insertions, 1 deletions

diff --git a/Http/Tests/RememberMe/ResponseListenerTest.php b/Http/Tests/RememberMe/ResponseListenerTest.php
index 9bb84a2..3dcca70 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('getRequestType')->will($this->returnValue($type));
         $event->expects($this->any())->method('getResponse')->will($this->returnValue($response));
 
         return $event;