Fix reviews, add tests against redirections

Jérôme Deuchnord · Jérôme Deuchnord · commit 0b76a1885031 · 2022-03-04T16:24:32.000+01:00
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -171,28 +171,36 @@ private function collectOnClient(TraceableHttpClient $client): array
 
     private function getCurlCommand(array $trace): ?string
     {
-        $debug = explode("\n", ($trace['info']['debug']));
+        $debug = explode("\n", $trace['info']['debug']);
         $url = $trace['info']['url'];
         $command = ['curl', '--compressed'];
 
-        $dataArg = null;
+        $dataArg = [];
 
         if ($json = $trace['options']['json'] ?? null) {
-            $dataArg = '--data '.escapeshellarg(json_encode($json, \JSON_PRETTY_PRINT));
+            $dataArg[] = '--data '.escapeshellarg(json_encode($json, \JSON_PRETTY_PRINT));
         } elseif ($body = $trace['options']['body'] ?? null) {
             if (\is_string($body)) {
-                $dataArg = '--data '.escapeshellarg($body);
+                $dataArg[] = '--data '.escapeshellarg($body);
             } elseif (\is_array($body)) {
                 foreach ($body as $key => $value) {
-                    $dataArg = '--data '.escapeshellarg("$key=$value");
+                    $dataArg[] = '--data '.escapeshellarg("$key=$value");
                 }
             } else {
                 return null;
             }
         }
 
+        $dataArg = empty($dataArg) ? null : implode(' ', $dataArg);
+
         foreach ($debug as $line) {
-            $line = str_replace("\r", '', $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;
             }
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -189,6 +189,29 @@ public function testItGeneratesCurlCommandsAsExpected()
 );
     }
 
+    public function testItDoesNotFollowRedirectionsWhenGeneratingCurlCommands()
+    {
+        $sut = new HttpClientDataCollector();
+        $sut->registerClient('http_client', $this->httpClientThatHasTracedRequests([
+                [
+                    'method' => 'GET',
+                    'url' => 'http://symfony.com/releases.json',
+                ],
+            ]));
+        $sut->collect(new Request(), new Response());
+        $collectedData = $sut->getClients();
+        self::assertCount(1, $collectedData['http_client']['traces']);
+        $curlCommand = $collectedData['http_client']['traces'][0]['curlCommand'];
+        self::assertEquals("curl \\
+  --compressed \\
+  --request GET \\
+  --url 'https://symfony.com/releases.json' \\
+  --header 'Accept: */*' \\
+  --header 'Accept-Encoding: gzip' \\
+  --header 'User-Agent: Symfony HttpClient/Native'", $curlCommand
+);
+    }
+
     public function testItDoesNotGeneratesCurlCommandsForUnsupportedBodyType()
     {
         $sut = new HttpClientDataCollector();
