bug #35562 [HttpClient] fix HttpClientDataCollector when handling canceled responses (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit a2d6d11085e1 · 2020-02-03T09:07:24.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpClient] fix HttpClientDataCollector when handling canceled responses | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #35458 | License | MIT | Doc PR | - Commits ------- 303f9e5 [HttpClient] fix HttpClientDataCollector when handling canceled responses
diff --git a/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php b/src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
@@ -116,7 +116,7 @@ private function collectOnClient(TraceableHttpClient $client): array
 
             unset($info['filetime'], $info['http_code'], $info['ssl_verify_result'], $info['content_type']);
 
-            if ($trace['method'] === $info['http_method']) {
+            if (($info['http_method'] ?? null) === $trace['method']) {
                 unset($info['http_method']);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ private function collectOnClient(TraceableHttpClient $client): array`
`116`	`116`
`117`	`117`	`unset($info['filetime'], $info['http_code'], $info['ssl_verify_result'], $info['content_type']);`
`118`	`118`
`119`		`- if ($trace['method'] === $info['http_method']) {`
	`119`	`+ if (($info['http_method'] ?? null) === $trace['method']) {`
`120`	`120`	`unset($info['http_method']);`
`121`	`121`	`}`
`122`	`122`