Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit 9ac8f73bc833 · 2019-11-28T15:12:27.000+01:00
* 4.3:
  bug #34554 [HttpClient] Fix early cleanup of pushed HTTP/2 responses (lyrixx)
diff --git a/Tests/CurlHttpClientTest.php b/Tests/CurlHttpClientTest.php
@@ -128,7 +128,7 @@ private function getVulcainClient(): CurlHttpClient
             return $client;
         }
 
-        if (200 !== $client->request('GET', 'http://127.0.0.1:8057/json')->getStatusCode()) {
+        if (['application/json'] !== $client->request('GET', 'http://127.0.0.1:8057/json')->getHeaders()['content-type']) {
             $this->markTestSkipped('symfony/http-client-contracts >= 2.0.1 required');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ private function getVulcainClient(): CurlHttpClient`
`128`	`128`	`return $client;`
`129`	`129`	`}`
`130`	`130`
`131`		`- if (200 !== $client->request('GET', 'http://127.0.0.1:8057/json')->getStatusCode()) {`
	`131`	`+ if (['application/json'] !== $client->request('GET', 'http://127.0.0.1:8057/json')->getHeaders()['content-type']) {`
`132`	`132`	`$this->markTestSkipped('symfony/http-client-contracts >= 2.0.1 required');`
`133`	`133`	`}`
`134`	`134`