symfony
diff --git a/‎src/Symfony/Component/HttpClient/Response/StreamWrapper.php
Lines changed: 16 additions & 5 deletions b/‎src/Symfony/Component/HttpClient/Response/StreamWrapper.php
Lines changed: 16 additions & 5 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
Lines changed: 12 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
Lines changed: 1 addition & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
Lines changed: 1 addition & 0 deletions
@@ -22,7 +22,7 @@
  */
 class StreamWrapper
 {
-    /** @var resource|string|null */
+    /** @var resource|null */
     public $context;
 
     /** @var HttpClientInterface */
@@ -31,7 +31,7 @@ class StreamWrapper
     /** @var ResponseInterface */
     private $response;
 
-    /** @var resource|null */
+    /** @var resource|string|null */
     private $content;
 
     /** @var resource|null */
     {
         $this->handle = &$handle;
         $this->content = &$content;
+        $this->offset = null;
     }
 
     public function stream_open(string $path, string $mode, int $options): bool
@@ -125,7 +126,7 @@ public function stream_read(int $count)
                 }
             }
 
-            if (0 !== fseek($this->content, $this->offset)) {
+            if (0 !== fseek($this->content, $this->offset ?? 0)) {
                 return false;
             }
 
@@ -154,6 +155,11 @@ public function stream_read(int $count)
             try {
                 $this->eof = true;
                 $this->eof = !$chunk->isTimeout();
+
+                if (!$this->eof && !$this->blocking) {
+                    return '';
+                }
+
                 $this->eof = $chunk->isLast();
 
                 if ($chunk->isFirst()) {
@@ -196,7 +202,7 @@ public function stream_set_option(int $option, int $arg1, ?int $arg2): bool
 
     public function stream_tell(): int
     {
-        return $this->offset;
+        return $this->offset ?? 0;
     }
 
     public function stream_eof(): bool
@@ -206,14 +212,19 @@ public function stream_eof(): bool
 
     public function stream_seek(int $offset, int $whence = \SEEK_SET): bool
     {
+        if (null === $this->content && null === $this->offset) {
+            $this->response->getStatusCode();
+            $this->offset = 0;
+        }
+
         if (!\is_resource($this->content) || 0 !== fseek($this->content, 0, \SEEK_END)) {
             return false;
         }
 
         $size = ftell($this->content);
 
         if (\SEEK_CUR === $whence) {
-            $offset += $this->offset;
+            $offset += $this->offset ?? 0;
         }
 
         if (\SEEK_END === $whence || $size < $offset) {
 
@@ -118,6 +118,18 @@ public function testNonBlockingStream()
         $this->assertTrue(feof($stream));
     }
 
+    public function testSeekAsyncStream()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://localhost:8057/timeout-body');
+        $stream = $response->toStream(false);
+
+        $this->assertSame(0, fseek($stream, 0, \SEEK_CUR));
+        $this->assertSame('<1>', fread($stream, 8192));
+        $this->assertFalse(feof($stream));
+        $this->assertSame('<2>', stream_get_contents($stream));
+    }
+
     public function testTimeoutIsNotAFatalError()
     {
         $client = $this->getHttpClient(__FUNCTION__);
 
@@ -311,6 +311,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 return $client;
 
             case 'testNonBlockingStream':
+            case 'testSeekAsyncStream':
                 $responses[] = new MockResponse((function () { yield '<1>'; yield ''; yield '<2>'; })(), ['response_headers' => $headers]);
                 break;
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`*/`
`23`	`23`	`class StreamWrapper`
`24`	`24`	`{`
`25`		`- /** @var resource\|string\|null */`
	`25`	`+ /** @var resource\|null */`
`26`	`26`	`public $context;`
`27`	`27`
`28`	`28`	`/** @var HttpClientInterface */`
`@@ -31,7 +31,7 @@ class StreamWrapper`
`31`	`31`	`/** @var ResponseInterface */`
`32`	`32`	`private $response;`
`33`	`33`
`34`		`- /** @var resource\|null */`
	`34`	`+ /** @var resource\|string\|null */`
`35`	`35`	`private $content;`
`36`	`36`
`37`	`37`	`/** @var resource\|null */`
`@@ -81,6 +81,7 @@ public function bindHandles(&$handle, &$content): void`
`81`	`81`	`{`
`82`	`82`	`$this->handle = &$handle;`
`83`	`83`	`$this->content = &$content;`
	`84`	`+ $this->offset = null;`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`public function stream_open(string $path, string $mode, int $options): bool`
`@@ -125,7 +126,7 @@ public function stream_read(int $count)`
`125`	`126`	`}`
`126`	`127`	`}`
`127`	`128`
`128`		`- if (0 !== fseek($this->content, $this->offset)) {`
	`129`	`+ if (0 !== fseek($this->content, $this->offset ?? 0)) {`
`129`	`130`	`return false;`
`130`	`131`	`}`
`131`	`132`
`@@ -154,6 +155,11 @@ public function stream_read(int $count)`
`154`	`155`	`try {`
`155`	`156`	`$this->eof = true;`
`156`	`157`	`$this->eof = !$chunk->isTimeout();`
	`158`	`+`
	`159`	`+ if (!$this->eof && !$this->blocking) {`
	`160`	`+ return '';`
	`161`	`+ }`
	`162`	`+`
`157`	`163`	`$this->eof = $chunk->isLast();`
`158`	`164`
`159`	`165`	`if ($chunk->isFirst()) {`
`@@ -196,7 +202,7 @@ public function stream_set_option(int $option, int $arg1, ?int $arg2): bool`
`196`	`202`
`197`	`203`	`public function stream_tell(): int`
`198`	`204`	`{`
`199`		`- return $this->offset;`
	`205`	`+ return $this->offset ?? 0;`
`200`	`206`	`}`
`201`	`207`
`202`	`208`	`public function stream_eof(): bool`
`@@ -206,14 +212,19 @@ public function stream_eof(): bool`
`206`	`212`
`207`	`213`	`public function stream_seek(int $offset, int $whence = \SEEK_SET): bool`
`208`	`214`	`{`
	`215`	`+ if (null === $this->content && null === $this->offset) {`
	`216`	`+ $this->response->getStatusCode();`
	`217`	`+ $this->offset = 0;`
	`218`	`+ }`
	`219`	`+`
`209`	`220`	`if (!\is_resource($this->content) \|\| 0 !== fseek($this->content, 0, \SEEK_END)) {`
`210`	`221`	`return false;`
`211`	`222`	`}`
`212`	`223`
`213`	`224`	`$size = ftell($this->content);`
`214`	`225`
`215`	`226`	`if (\SEEK_CUR === $whence) {`
`216`		`- $offset += $this->offset;`
	`227`	`+ $offset += $this->offset ?? 0;`
`217`	`228`	`}`
`218`	`229`
`219`	`230`	`if (\SEEK_END === $whence \|\| $size < $offset) {`