symfony
diff --git a/‎src/Symfony/Component/HttpClient/HttpClientTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClientTrait.php
+12-9Lines changed: 12 additions & 9 deletions b/‎src/Symfony/Component/HttpClient/HttpClientTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClientTrait.php
+12-9Lines changed: 12 additions & 9 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+4Lines changed: 4 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+4Lines changed: 4 additions & 0 deletions
@@ -481,17 +481,20 @@ private static function mergeQueryString(?string $queryString, array $queryArray
             }
         }
 
-        foreach ($queryArray as $k => $v) {
-            if (is_scalar($v)) {
-                $queryArray[$k] = rawurlencode($k).'='.rawurlencode($v);
-            } elseif (null === $v) {
-                unset($queryArray[$k]);
-
-                if ($replace) {
+        if ($replace) {
+            foreach ($queryArray as $k => $v) {
+                if (null === $v) {
                     unset($query[$k]);
                 }
-            } else {
-                throw new InvalidArgumentException(sprintf('Unsupported value for query parameter "%s": scalar or null expected, %s given.', $k, \gettype($v)));
+            }
+        }
+
+        $queryString = http_build_query($queryArray, '', '&', PHP_QUERY_RFC3986);
+        $queryArray = [];
+
+        if ($queryString) {
+            foreach (explode('&', $queryString) as $v) {
+                $queryArray[rawurldecode(explode('=', $v, 2)[0])] = $v;
             }
         }
 
 
@@ -141,6 +141,10 @@ public function provideParseUrl()
         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', 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%5Bb%5D=c', null], 'bar', ['a' => ['b' => 'c']]];
+        yield [[null, null, 'bar', '?a%5Bb%5Bc%5D=d', null], 'bar?a[b[c]=d', []];
+        yield [[null, null, 'bar', '?a%5Bb%5D%5Bc%5D=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]];
+        yield [[null, null, 'bar', '?a=b&a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']];
     }
 
     /**
Original file line number	Diff line number	Diff line change
`@@ -481,17 +481,20 @@ private static function mergeQueryString(?string $queryString, array $queryArray`
`481`	`481`	`}`
`482`	`482`	`}`
`483`	`483`
`484`		`- foreach ($queryArray as $k => $v) {`
`485`		`- if (is_scalar($v)) {`
`486`		`- $queryArray[$k] = rawurlencode($k).'='.rawurlencode($v);`
`487`		`- } elseif (null === $v) {`
`488`		`- unset($queryArray[$k]);`
`489`		`-`
`490`		`- if ($replace) {`
	`484`	`+ if ($replace) {`
	`485`	`+ foreach ($queryArray as $k => $v) {`
	`486`	`+ if (null === $v) {`
`491`	`487`	`unset($query[$k]);`
`492`	`488`	`}`
`493`		`- } else {`
`494`		`- throw new InvalidArgumentException(sprintf('Unsupported value for query parameter "%s": scalar or null expected, %s given.', $k, \gettype($v)));`
	`489`	`+ }`
	`490`	`+ }`
	`491`	`+`
	`492`	`+ $queryString = http_build_query($queryArray, '', '&', PHP_QUERY_RFC3986);`
	`493`	`+ $queryArray = [];`
	`494`	`+`
	`495`	`+ if ($queryString) {`
	`496`	`+ foreach (explode('&', $queryString) as $v) {`
	`497`	`+ $queryArray[rawurldecode(explode('=', $v, 2)[0])] = $v;`
`495`	`498`	`}`
`496`	`499`	`}`
`497`	`500`