[HttpClient] Fix multidimensional array as body in copy as curl

HypeMC · HypeMC · commit d8c5f2d54154 · 2022-06-04T22:07:02.000+02:00
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -199,8 +199,9 @@ private function getCurlCommand(array $trace): ?string
             if (\is_string($body)) {
                 $dataArg[] = '--data '.escapeshellarg($body);
             } elseif (\is_array($body)) {
-                foreach ($body as $key => $value) {
-                    $dataArg[] = '--data '.escapeshellarg("$key=$value");
+                $body = explode('&', self::normalizeBody($body));
+                foreach ($body as $value) {
+                    $dataArg[] = '--data '.escapeshellarg(urldecode($value));
                 }
             } else {
                 return null;
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -244,6 +244,21 @@ public function provideCurlRequests(): iterable
                         'foo' => 'fooval',
                         'bar' => 'barval',
                         'baz' => 'bazval',
+                        'foobar' => [
+                            'baz' => 'bazval',
+                            'qux' => 'quxval',
+                        ],
+                        'bazqux' => ['bazquxval1', 'bazquxval2'],
+                        'object' => (object) [
+                            'fooprop' => 'foopropval',
+                            'barprop' => 'barpropval',
+                        ],
+                        'tostring' => new class() {
+                            public function __toString(): string
+                            {
+                                return 'tostringval';
+                            }
+                        },
                     ],
                 ],
             ],
@@ -253,10 +268,10 @@ public function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sContent-Type: application/x-www-form-urlencoded%1$s \\
-  --header %1$sContent-Length: 32%1$s \\
+  --header %1$sContent-Length: 211%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
   --header %1$sUser-Agent: Symfony HttpClient/Native%1$s \\
-  --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s',
+  --data %1$sfoo=fooval%1$s --data %1$sbar=barval%1$s --data %1$sbaz=bazval%1$s --data %1$sfoobar[baz]=bazval%1$s --data %1$sfoobar[qux]=quxval%1$s --data %1$sbazqux[0]=bazquxval1%1$s --data %1$sbazqux[1]=bazquxval2%1$s --data %1$sobject[fooprop]=foopropval%1$s --data %1$sobject[barprop]=barpropval%1$s --data %1$stostring=tostringval%1$s',
         ];
 
         // escapeshellarg on Windows replaces double quotes & percent signs with spaces
