symfony
diff --git a/‎src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
Lines changed: 39 additions & 23 deletions b/‎src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
Lines changed: 39 additions & 23 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
Lines changed: 16 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
Lines changed: 16 additions & 0 deletions
@@ -178,8 +178,38 @@ private function getCurlCommand(array $trace): ?string
             return null;
         }
 
+        $scheme = parse_url($trace['url'], \PHP_URL_SCHEME) ?? parse_url($trace['options']['base_uri'], \PHP_URL_SCHEME);
+        $host = $request = $path = null;
+        $headers = [];
+
         $debug = explode("\n", $trace['info']['debug']);
-        $url = self::mergeQueryString($trace['url'], $trace['options']['query'] ?? [], true);
+        foreach ($debug as $line) {
+            $line = substr($line, 0, -1);
+
+            if (str_starts_with('< ', $line)) {
+                // End of the request, beginning of the response. Stop parsing.
+                break;
+            }
+
+            if ('' === $line || str_starts_with($line, '*')) {
+                continue;
+            }
+
+            if (preg_match('/Host: (.+)/', $line, $match)) {
+                $host = $match[1];
+                continue;
+            }
+
+            if (preg_match('/^> ([A-Z]+) ([^ ]+)/', $line, $match)) {
+                [, $request, $path] = $match;
+                continue;
+            }
+
+            $headers[] = $line;
+        }
+
+        $url = $scheme.'://'.$host.$path;
+
         $command = ['curl', '--compressed'];
 
         if (isset($trace['options']['resolve'])) {
@@ -191,6 +221,13 @@ private function getCurlCommand(array $trace): ?string
             }
         }
 
+        $command[] = sprintf('--request %s', $request);
+        $command[] = sprintf('--url %s', escapeshellarg($url));
+
+        foreach ($headers as $header) {
+            $command[] = '--header '.escapeshellarg($header);
+        }
+
         $dataArg = [];
 
         if ($json = $trace['options']['json'] ?? null) {
@@ -199,7 +236,7 @@ private function getCurlCommand(array $trace): ?string
             if (\is_string($body)) {
                 try {
                     $dataArg[] = '--data '.escapeshellarg($body);
-                } catch (\ValueError $e) {
+                } catch (\ValueError) {
                     return null;
                 }
             } elseif (\is_array($body)) {
@@ -214,27 +251,6 @@ private function getCurlCommand(array $trace): ?string
 
         $dataArg = empty($dataArg) ? null : implode(' ', $dataArg);
 
-        foreach ($debug as $line) {
-            $line = substr($line, 0, -1);
-
-            if (str_starts_with('< ', $line)) {
-                // End of the request, beginning of the response. Stop parsing.
-                break;
-            }
-
-            if ('' === $line || preg_match('/^[*<]|(Host: )/', $line)) {
-                continue;
-            }
-
-            if (preg_match('/^> ([A-Z]+)/', $line, $match)) {
-                $command[] = sprintf('--request %s', $match[1]);
-                $command[] = sprintf('--url %s', escapeshellarg($url));
-                continue;
-            }
-
-            $command[] = '--header '.escapeshellarg($line);
-        }
-
         if (null !== $dataArg) {
             $command[] = $dataArg;
         }
 
@@ -194,6 +194,22 @@ public function provideCurlRequests(): iterable
   --url %1$shttp://localhost:8057/json%1$s \\
   --header %1$sAccept: */*%1$s \\
   --header %1$sAccept-Encoding: gzip%1$s \\
+  --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
+        ];
+        yield 'GET with base uri' => [
+            [
+                'method' => 'GET',
+                'url' => '1',
+                'options' => [
+                    'base_uri' => 'http://localhost:8057/json/',
+                ],
+            ],
+            'curl \\
+  --compressed \\
+  --request GET \\
+  --url %1$shttp://localhost:8057/json/1%1$s \\
+  --header %1$sAccept: */*%1$s \\
+  --header %1$sAccept-Encoding: gzip%1$s \\
   --header %1$sUser-Agent: Symfony HttpClient/Native%1$s',
         ];
         yield 'GET with resolve' => [