[HttpClient] fixes

Author: nicolas-grekas

ResponseInterface.php

@@ -71,6 +71,7 @@ public function getContent(bool $throw = true): string;
      *  - redirect_count - the number of redirects followed while executing the request
      *  - redirect_url - the resolved location of redirect responses, null otherwise
      *  - start_time - the time when the request was sent or 0.0 when it's pending
+     *  - http_method - the HTTP verb of the last request
      *  - http_code - the last response code or 0 when it is not known yet
      *  - error - the error message when the transfer was aborted, null otherwise
      *  - data - the value of the "data" request option, null if not set

Test/HttpClientTestCase.php

@@ -214,7 +214,9 @@ public function testRedirects()
         $client = $this->getHttpClient();
         $response = $client->request('POST', 'http://localhost:8057/301', [
             'auth' => 'foo:bar',
-            'body' => 'foo=bar',
+            'body' => function () {
+                yield 'foo=bar';
+            },
         ]);
 
         $body = json_decode($response->getContent(), true);
@@ -236,7 +238,9 @@ public function testRedirects()
             'Content-Type: application/json',
         ];
 
-        $filteredHeaders = array_intersect($expected, $response->getInfo('raw_headers'));
+        $filteredHeaders = array_values(array_filter($response->getInfo('raw_headers'), function ($h) {
+            return \in_array(substr($h, 0, 4), ['HTTP', 'Loca', 'Cont'], true) && 'Content-Encoding: gzip' !== $h;
+        }));
 
         $this->assertSame($expected, $filteredHeaders);
     }
@@ -261,6 +265,16 @@ public function testRelativeRedirects()
     public function testRedirect307()
     {
         $client = $this->getHttpClient();
+
+        $response = $client->request('POST', 'http://localhost:8057/307', [
+            'body' => function () {
+                yield 'foo=bar';
+            },
+            'max_redirects' => 0,
+        ]);
+
+        $this->assertSame(307, $response->getStatusCode());
+
         $response = $client->request('POST', 'http://localhost:8057/307', [
             'body' => 'foo=bar',
         ]);
@@ -297,7 +311,9 @@ public function testMaxRedirects()
             'Content-Type: application/json',
         ];
 
-        $filteredHeaders = array_intersect($expected, $response->getInfo('raw_headers'));
+        $filteredHeaders = array_values(array_filter($response->getInfo('raw_headers'), function ($h) {
+            return \in_array(substr($h, 0, 4), ['HTTP', 'Loca', 'Cont'], true);
+        }));
 
         $this->assertSame($expected, $filteredHeaders);
     }
@@ -416,6 +432,7 @@ public function testPostCallback()
         $response = $client->request('POST', 'http://localhost:8057/post', [
             'body' => function () {
                 yield 'foo';
+                yield '';
                 yield '=';
                 yield '0123456789';
             },