bug #35672 [HttpClient] fix HttpClientDataCollector when handling canceled responses (thematchless)

nicolas-grekas · nicolas-grekas · commit c895a400d911 · 2020-02-11T11:44:52.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 | - | License | MIT | Doc PR | - small addition to the already merged #35562 Commits ------- 7088ef7 [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
@@ -120,7 +120,7 @@ private function collectOnClient(TraceableHttpClient $client): array
                 unset($info['http_method']);
             }
 
-            if ($trace['url'] === $info['url']) {
+            if (($info['url'] ?? null) === $trace['url']) {
                 unset($info['url']);
             }
 

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private function collectOnClient(TraceableHttpClient $client): array`
`120`	`120`	`unset($info['http_method']);`
`121`	`121`	`}`
`122`	`122`
`123`		`- if ($trace['url'] === $info['url']) {`
	`123`	`+ if (($info['url'] ?? null) === $trace['url']) {`
`124`	`124`	`unset($info['url']);`
`125`	`125`	`}`
`126`	`126`