Merge branch '3.4' into 4.4

nicolas-grekas · nicolas-grekas · commit d9506ab8433e · 2020-05-30T23:49:23.000+02:00
* 3.4:
  [DI] fix typo
diff --git a/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php b/src/Symfony/Component/HttpClient/Tests/DataCollector/HttpClientDataCollectorTest.php
@@ -172,7 +172,7 @@ private function httpClientThatHasTracedRequests($tracedRequests): TraceableHttp
 
         foreach ($tracedRequests as $request) {
             $response = $httpClient->request($request['method'], $request['url'], $request['options'] ?? []);
-            $response->getContent(false); // To avoid exception in ResponseTrait::doDestruct
+            $response->getContent(false); // disables exceptions from destructors
         }
 
         return $httpClient;

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ private function httpClientThatHasTracedRequests($tracedRequests): TraceableHttp`
`172`	`172`
`173`	`173`	`foreach ($tracedRequests as $request) {`
`174`	`174`	`$response = $httpClient->request(< 54DA span class=pl-c1>$request['method'], $request['url'], $request['options'] ?? []);`
`175`		`- $response->getContent(false); // To avoid exception in ResponseTrait::doDestruct`
	`175`	`+ $response->getContent(false); // disables exceptions from destructors`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`return $httpClient;`