[BrowserKit] Allowing body content from GET with a content-type

thiagomp · nicolas-grekas · commit 93c2f5e891e7 · 2020-12-08T15:40:01.000+01:00
diff --git a/src/Symfony/Component/BrowserKit/CHANGELOG.md b/src/Symfony/Component/BrowserKit/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * Added `jsonRequest` method to `AbstractBrowser`
+ * Allowed sending a body with GET requests when a content-type is defined
 
 5.2.0
 -----
diff --git a/src/Symfony/Component/BrowserKit/HttpBrowser.php b/src/Symfony/Component/BrowserKit/HttpBrowser.php
@@ -61,7 +61,7 @@ protected function doRequest($request): Response
      */
     private function getBodyAndExtraHeaders(Request $request, array $headers): array
     {
-        if (\in_array($request->getMethod(), ['GET', 'HEAD'])) {
+        if (\in_array($request->getMethod(), ['GET', 'HEAD']) && !isset($headers['content-type'])) {
             return ['', []];
         }
 
diff --git a/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php b/src/Symfony/Component/BrowserKit/Tests/HttpBrowserTest.php
@@ -63,6 +63,14 @@ public function validContentTypes()
             ['POST', 'http://example.com/', [], [], ['CONTENT_TYPE' => 'application/json'], '["content"]'],
             ['POST', 'http://example.com/', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
         ];
+        yield 'GET JSON' => [
+            ['GET', 'http://example.com/jsonrpc', [], [], ['CONTENT_TYPE' => 'application/json'], '["content"]'],
+            ['GET', 'http://example.com/jsonrpc', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
+        ];
+        yield 'HEAD JSON' => [
+            ['HEAD', 'http://example.com/jsonrpc', [], [], ['CONTENT_TYPE' => 'application/json'], '["content"]'],
+            ['HEAD', 'http://example.com/jsonrpc', ['headers' => $defaultHeaders + ['content-type' => 'application/json'], 'body' => '["content"]', 'max_redirects' => 0]],
+        ];
     }
 
     public function testMultiPartRequestWithSingleFile()

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ protected function doRequest($request): Response`
`61`	`61`	`*/`
`62`	`62`	`private function getBodyAndExtraHeaders(Request $request, array $headers): array`
`63`	`63`	`{`
`64`		`- if (\in_array($request->getMethod(), ['GET', 'HEAD'])) {`
	`64`	`+ if (\in_array($request->getMethod(), ['GET', 'HEAD']) && !isset($headers['content-type'])) {`
`65`	`65`	`return ['', []];`
`66`	`66`	`}`
`67`	`67`