[HttpClient] Improve default content-type handling

nicolas-grekas · nicolas-grekas · commit 91099a93b386 · 2022-03-22T17:24:06.000+01:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -97,6 +97,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (isset($options['body'])) {
+            if (\is_array($options['body'])) {
+                $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
+            }
+
             $options['body'] = self::normalizeBody($options['body']);
 
             if (\is_string($options['body'])
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -252,8 +252,8 @@ public function provideCurlRequests(): iterable
   --request POST \\
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
-  --header %1$sContent-Length: 32%1$s \\
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
+  --header %1$sContent-Length: 32%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
   --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\
   --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s',
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -455,4 +455,22 @@ public function getRedirectWithAuthTests()
             'other host' => ['url' => 'http://127.0.0.1:8057/302', 'redirectWithAuth' => false],
         ];
     }
+
+    public function testDefaultContentType()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $client = $client->withOptions(['headers' => ['Content-Type: application/json']]);
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => ['abc' => 'def'],
+        ]);
+
+        $this->assertSame(['abc' => 'def', 'REQUEST_METHOD' => 'POST'], $response->toArray());
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => '{"abc": "def"}',
+        ]);
+
+        $this->assertSame(['abc' => 'def', 'content-type' => 'application/json', 'REQUEST_METHOD' => 'POST'], $response->toArray());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,10 @@ private static function prepareRequest(?string $method, ?string $url, array $opt`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`if (isset($options['body'])) {`
	`100`	`+ if (\is_array($options['body'])) {`
	`101`	`+ $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];`
	`102`	`+ }`
	`103`	`+`
`100`	`104`	`$options['body'] = self::normalizeBody($options['body']);`
`101`	`105`
`102`	`106`	`8000 if (\is_string($options['body'])`