Fix content not reported in TracableResponse decorated by AsyncResponse

jderusse · jderusse · commit 277403e83633 · 2020-10-19T20:21:47.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/TraceableResponse.php b/src/Symfony/Component/HttpClient/Response/TraceableResponse.php
@@ -132,6 +132,9 @@ public static function stream(HttpClientInterface $client, iterable $responses,
         }
 
         foreach ($client->stream($wrappedResponses, $timeout) as $r => $chunk) {
+            if (false !== $traceableMap[$r]->content && null === $chunk->getError()) {
+                $traceableMap[$r]->content .= $chunk->getContent();
+            }
             yield $traceableMap[$r] => $chunk;
         }
     }
diff --git a/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/TraceableHttpClientTest.php
@@ -115,4 +115,17 @@ public function testStream()
         $this->assertGreaterThan(1, \count($chunks));
         $this->assertSame('Symfony is awesome!', implode('', $chunks));
     }
+
+    public function testStreamCollectContent()
+    {
+        $sut = new TraceableHttpClient(new NativeHttpClient());
+        $response = $sut->request('GET', 'http://localhost:8057/json/1');
+        foreach ($sut->stream($response) as $chunk) {
+            // no-op
+        }
+
+        $this->assertCount(1, $tracedRequests = $sut->getTracedRequests());
+        $actualTracedRequest = $tracedRequests[0];
+        $this->assertSame('{"title":"\\/json\\/1"}', $actualTracedRequest['content']);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,9 @@ public static function stream(HttpClientInterface $client, iterable $responses,`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`foreach ($client->stream($wrappedResponses, $timeout) as $r => $chunk) {`
	`135`	`+ if (false !== $traceableMap[$r]->content && null === $chunk->getError()) {`
	`136`	`+ $traceableMap[$r]->content .= $chunk->getContent();`
	`137`	`+ }`
`135`	`138`	`yield $traceableMap[$r] => $chunk;`
`136`	`139`	`}`
`137`	`140`	`}`