Merge pull request #485 from FriendsOfSymfony/update-master-from-1.4

Merging 1.4 into master

Author: dbu

CHANGELOG.md

@@ -3,6 +3,14 @@ Changelog
 
 See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpCache/releases).
 
+unreleased
+----------
+
+### Symfony HttpCache
+
+* Added a neutral "Bad Request" body to user hash mismatch response to have
+  something searchable in the code when debugging.
+
 2.9.2
 -----
 
@@ -313,6 +321,12 @@ See also the [GitHub releases page](https://github.com/FriendsOfSymfony/FOSHttpC
   tags are formatted, use the new `header_formatter` option with a
   `TagHeaderFormatter`.
 
+1.4.6
+-----
+
+* [Symfony HttpCache] Added a neutral "Bad Request" body to user hash mismatch
+  response to have something searchable in the code when debugging.
+
 1.4.5
 -----
 

src/SymfonyCache/UserContextListener.php

@@ -113,7 +113,7 @@ public function preHandle(CacheEvent $event)
             if ($request->headers->get('accept') === $this->options['user_hash_accept_header']
                 || null !== $request->headers->get($this->options['user_hash_header'])
             ) {
-                $event->setResponse(new Response('', 400));
+                $event->setResponse(new Response('Bad Request', 400));
 
                 return;
             }

tests/Unit/SymfonyCache/UserContextListenerTest.php

@@ -76,6 +76,7 @@ public function testGenerateUserHashNotAllowed($arg, $options)
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertSame(400, $response->getStatusCode());
+        $this->assertSame('Bad Request', $response->getContent());
     }
 
     /**
@@ -94,6 +95,7 @@ public function testPassingUserHashNotAllowed($arg, $options)
 
         $this->assertInstanceOf(Response::class, $response);
         $this->assertSame(400, $response->getStatusCode());
+        $this->assertSame('Bad Request', $response->getContent());
     }
 
     /**