symfony
diff --git a/‎src/Symfony/Component/HttpClient/HttpClientTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClientTrait.php
+17-83Lines changed: 17 additions & 83 deletions b/‎src/Symfony/Component/HttpClient/HttpClientTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/HttpClientTrait.php
+17-83Lines changed: 17 additions & 83 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
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+2-2Lines changed: 2 additions & 2 deletions
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\HttpClient;
 
-use RecursiveArrayIterator;
-use RecursiveIteratorIterator;
 use Symfony\Component\HttpClient\Exception\InvalidArgumentException;
 
 /**
@@ -473,97 +471,33 @@ private static function mergeQueryString(?string $queryString, array $queryArray
         }
 
         $query = [];
-        if (null !== $queryString && '' !== $queryString) {
-            $query = self::parseQueryString($queryString);
-        }
-
-        if (!empty($queryArray)) {
-            $query = self::mergeQueryParams($query, $queryArray, $replace);
-        }
 
-        $finalQueryString = '';
-        if (!empty($query)) {
-            $iterator = new RecursiveIteratorIterator(new RecursiveArrayIterator($query));
-            $iterator->rewind();
-            foreach ($iterator as $v) {
-                $finalQueryString .= ($finalQueryString ? '&' : '').$v;
+        if (null !== $queryString) {
+            foreach (explode('&', $queryString) as $v) {
+                if ('' !== $v) {
+                    $k = urldecode(explode('=', $v, 2)[0]);
+                    $query[$k] = (isset($query[$k]) ? $query[$k].'&' : '').$v;
+                }
             }
         }
 
-        return $finalQueryString;
-    }
-
-    /**
-     * Custom query string parser.
-     * We cannot use parse_str() here as it replaces some characters and breaks legit query strings.
-     *
-     * @param string $queryString
-     *
-     * @return array
-     */
-    private static function parseQueryString($queryString)
-    {
-        $query = [];
-        foreach (explode('&', $queryString) as $v) {
-            if ('' == $v) {
-                continue;
-            }
-
-            if (false === $n = strpos($v, '=')) {
-                $k = $v;
-            } else {
-                $k = substr($v, 0, $n);
-            }
-
-            if (preg_match('/^(?P<key>[^\[]*)(?P<keys>\[.*\])$/', $k, $matches)) {
-                $firstKey = $matches['key'];
-                preg_match_all('/(?<=\[).+?(?=\])/', $matches['keys'], $matches);
-                $keys = array_reverse($matches[0]);
-                $query[urldecode($firstKey)] = array_reduce($keys, function ($array, $item) {
-                    return [$item => $array];
-                }, $v);
-            } else {
-                $query[urldecode($k)] = (isset($query[$k]) ? $query[$k].'&' : '').$v;
+        if ($replace) {
+            foreach ($queryArray as $k => $v) {
+                if (null === $v) {
+                    unset($query[$k]);
+                }
             }
         }
 
-        return $query;
-    }
-
-    /**
-     * @param array  $query
-     * @param array  $queryArray
-     * @param bool   $replace
-     * @param string $parentPath
-     *
-     * @return array
-     */
-    private static function mergeQueryParams(array $query, array $queryArray, bool $replace, string $parentPath = ''): array
-    {
-        foreach ($queryArray as $k => $v) {
-            if (!$replace && isset($query[$k]) && (!\is_array($v) || is_scalar($query[$k]))) {
-                continue;
-            }
-
-            $path = $parentPath.($parentPath ? '[' : '').$k.($parentPath ? ']' : '');
-
-            if ($replace || !isset($query[$k])) {
-                if (\is_array($v) && (!isset($query[$k]) || !\is_array($query[$k]))) {
-                    $query[$k] = [];
-                }
+        $queryString = http_build_query($queryArray, '', '&',  PHP_QUERY_RFC3986);
+        $queryArray = [];
 
-                if (null === $v) {
-                    unset($query[$k]);
-                } elseif (is_scalar($v)) {
-                    $query[$k] = rawurlencode($path).'='.rawurlencode($v);
-                } elseif (\is_array($v)) {
-                    $query[$k] = self::mergeQueryParams($query[$k], $v, $replace, $path);
-                } else {
-                    throw new InvalidArgumentException(sprintf('Unsupported value for query parameter "%s": scalar or null expected, %s given.', $path, \gettype($v)));
-                }
+        if ($queryString) {
+            foreach (explode('&', $queryString) as $v) {
+                $queryArray[rawurldecode(explode('=', $v, 2)[0])] = $v;
             }
         }
 
-        return $query;
+        return implode('&', $replace ? array_replace($query, $queryArray) : ($query + $queryArray));
     }
 }
@@ -143,8 +143,8 @@ public function provideParseUrl()
         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' => null]];
-        yield [[null, null, 'bar', '?a%5Bb%20c%5D=d&e%3Df=%E2%9C%93', null], 'bar?a=b', ['a' => ['b c' => 'd'], 'e=f' => '✓']];
+        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' => '✓']];
     }
 
     /**