[HttpClient] fix merge

nicolas-grekas · nicolas-grekas · commit 4ed436787a3f · 2022-10-17T19:21:03.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/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']) && !isset($options['normalized_headers']['content-type'])) {
+            if (\is_array($options['body']) && (!isset($options['normalized_headers']['content-type'][0]) || !str_contains($options['normalized_headers']['content-type'][0], 'application/x-www-form-urlencoded'))) {
                 $options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
             }
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ 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']) && !isset($options['normalized_headers']['content-type'])) {`
	`100`	`+ if (\is_array($options['body']) && (!isset($options['normalized_headers']['content-type'][0]) \|\| !str_contains($options['normalized_headers']['content-type'][0], 'application/x-www-form-urlencoded'))) {`
`101`	`101`	`$options['normalized_headers']['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];`
`102`	`102`	`}`
`103`	`103`