symfony
diff --git a/‎src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+39-6Lines changed: 39 additions & 6 deletions b/‎src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
+39-6Lines changed: 39 additions & 6 deletions
@@ -116,11 +116,11 @@ public function testNormalizeBodyMultipart()
      * @group network
      *
      * @requires extension openssl
-     *
-     * @dataProvider provideNormalizeBodyMultipartForwardStream
      */
-    public function testNormalizeBodyMultipartForwardStream($stream)
+    public function testNormalizeBodyMultipartForwardStreamUsingStreamWrapper($stream)
     {
+        $stream = fopen('https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png', 'r');
+
         $body = [
             'logo' => $stream,
         ];
@@ -151,10 +151,43 @@ public function testNormalizeBodyMultipartForwardStream($stream)
         $this->assertStringMatchesFormat($expected, $result);
     }
 
-    public static function provideNormalizeBodyMultipartForwardStream()
+    /**
+     * @group network
+     *
+     * @requires extension openssl
+     */
+    public function testNormalizeBodyMultipartForwardStreamWithHttpClient()
     {
-        yield 'native' => [fopen('https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png', 'r')];
-        yield 'symfony' => [HttpClient::create()->request('GET', 'https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png')->toStream()];
+        $stream = HttpClient::create()->request('GET', 'https://github.githubassets.com/images/icons/emoji/unicode/1f44d.png')->toStream();
+
+        $body = [
+            'logo' => $stream,
+        ];
+
+        $headers = [];
+        $body = self::normalizeBody($body, $headers);
+
+        $result = '';
+        while ('' !== $data = $body(self::$CHUNK_SIZE)) {
+            $result .= $data;
+        }
+
+        $this->assertSame(1, preg_match('/^Content-Type: multipart\/form-data; boundary=(?<boundary>.+)$/', $headers['content-type'][0], $matches));
+        $this->assertSame('Content-Length: 3086', $headers['content-length'][0]);
+        $this->assertSame(3086, \strlen($result));
+
+        $expected = <<<EOF
+            --{$matches['boundary']}
+            Content-Disposition: form-data; name="logo"; filename="1f44d.png"
+            Content-Type: image/png
+
+            %A
+            --{$matches['boundary']}--
+
+            EOF;
+        $expected = str_replace("\n", "\r\n", $expected);
+
+        $this->assertStringMatchesFormat($expected, $result);
     }
 
     /**