[HttpClient] Don't override header if is x-www-form-urlencoded

Author: Oipnet

HttpClientTrait.php

@@ -97,7 +97,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         if (isset($options['body'])) {
-            if (\is_array($options['body'])) {
+            if (\is_array($options['body']) && !isset($options['normalized_headers']['content-type'])) {
                 $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
             }
 

Tests/HttpClientTraitTest.php

@@ -49,6 +49,25 @@ public function providePrepareRequestUrl(): iterable
         yield ['http://example.com/?b=', 'http://example.com/', ['a' => null, 'b' => '']];
     }
 
+    public function testPrepareRequestWithBodyIsArray()
+    {
+        $defaults = [
+            'base_uri' => 'http://example.com?c=c',
+            'query' => ['a' => 1, 'b' => 'b'],
+            'body' => []
+        ];
+        [, $defaults] = self::prepareRequest(null, null, $defaults);
+
+        [,$options] = self::prepareRequest(null, 'http://example.com', [
+            'body' => [1, 2],
+            'headers' => [
+                'Content-Type' => 'application/x-www-form-urlencoded; charset=utf-8'
+            ]
+        ], $defaults);
+
+        $this->assertContains('Content-Type: application/x-www-form-urlencoded; charset=utf-8', $options['headers']);
+    }
+
     /**
      * @dataProvider provideResolveUrl
      */