Merge branch '5.4' into 6.2

* 5.4:
  [HttpClient] Encode "," in query strings

Author: nicolas-grekas

HttpClientTrait.php

@@ -622,7 +622,6 @@ private static function mergeQueryString(?string $queryString, array $queryArray
                     '%28' => '(',
                     '%29' => ')',
                     '%2A' => '*',
-                    '%2C' => ',',
                     '%2F' => '/',
                     '%3A' => ':',
                     '%3B' => ';',

Tests/HttpClientTraitTest.php

@@ -176,7 +176,7 @@ public static function provideParseUrl(): iterable
         yield [['http:', null, null, null, null], 'http:'];
         yield [['http:', null, 'bar', null, null], 'http:bar'];
         yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]];
-        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B,;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
+        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B%2C;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
         yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']];
         yield [[null, null, 'bar', '?a[b]=c', null], 'bar', ['a' => ['b' => 'c']]];
         yield [[null, null, 'bar', '?a[b[c]=d', null], 'bar?a[b[c]=d', []];