minor #35561 [HttpClient] dont display any content when none has been collected (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 5da9cf315ff9 · 2020-02-03T09:08:19.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [HttpClient] dont display any content when none has been collected | Q | A | ------------- | --- | Branch? | master | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 36536c9 [HttpClient] dont display any content when none has been collected
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -145,13 +145,15 @@ private function collectOnClient(TraceableHttpClient $client): array
                     $content = [$content];
                 }
 
-                $k = 'response_content';
+                $content = ['response_content' => $content];
+            } elseif (\is_array($content)) {
+                $content = ['response_json' => $content];
             } else {
-                $k = 'response_json';
+                $content = [];
             }
 
             $debugInfo = array_diff_key($info, $baseInfo);
-            $info = ['info' => $debugInfo] + array_diff_key($info, $debugInfo) + [$k => $content];
+            $info = ['info' => $debugInfo] + array_diff_key($info, $debugInfo) + $content;
             unset($traces[$i]['info']); // break PHP reference used by TraceableHttpClient
             $traces[$i]['info'] = $this->cloneVar($info);
             $traces[$i]['options'] = $this->cloneVar($trace['options']);
diff --git a/src/Symfony/Component/HttpClient/TraceableHttpClient.php b/src/Symfony/Component/HttpClient/TraceableHttpClient.php
@@ -37,7 +37,7 @@ public function __construct(HttpClientInterface $client)
      */
     public function request(string $method, string $url, array $options = []): ResponseInterface
     {
-        $content = '';
+        $content = null;
         $traceInfo = [];
         $this->tracedRequests[] = [
             'method' => $method,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public function __construct(HttpClientInterface $client)`
`37`	`37`	`*/`
`38`	`38`	`public function request(string $method, string $url, array $options = []): ResponseInterface`
`39`	`39`	`{`
`40`		`- $content = '';`
	`40`	`+ $content = null;`
`41`	`41`	`$traceInfo = [];`
`42`	`42`	`$this->tracedRequests[] = [`
`43`	`43`	`'method' => $method,`