[HttpClient] Fix MockResponse in case of header timeout

rmikalkenas · rmikalkenas · commit 2d6c309aea33 · 2024-01-24T16:36:15.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -90,17 +90,11 @@ public function getRequestMethod(): string
         return $this->requestMethod;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function getInfo(?string $type = null)
     {
         return null !== $type ? $this->info[$type] ?? null : $this->info;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function cancel(): void
     {
         $this->info['canceled'] = true;
@@ -116,9 +110,6 @@ public function cancel(): void
         $onProgress($this->offset, $dlSize, $this->info);
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function close(): void
     {
         $this->inflate = null;
@@ -159,9 +150,6 @@ public static function fromRequest(string $method, string $url, array $options,
         return $response;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected static function schedule(self $response, array &$runningResponses): void
     {
         if (!$response->id) {
@@ -203,7 +191,7 @@ protected static function perform(ClientState $multi, array &$responses): void
                     $chunk[1]->getStatusCode();
                     $chunk[1]->getHeaders(false);
                     self::readResponse($response, $chunk[0], $chunk[1], $offset);
-                    $multi->handlesActivity[$id][] = new FirstChunk();
+                    $multi->handlesActivity[$id][] = ($response->body[0] ?? null) instanceof ErrorChunk ? $response->body[0] : new FirstChunk();
                     $buffer = $response->requestOptions['buffer'] ?? null;
 
                     if ($buffer instanceof \Closure && $response->content = $buffer($response->headers) ?: null) {
@@ -223,9 +211,6 @@ protected static function perform(ClientState $multi, array &$responses): void
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected static function select(ClientState $multi, float $timeout): int
     {
         return 42;
diff --git a/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php b/src/Symfony/Component/HttpClient/Tests/Response/MockResponseTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\JsonException;
+use Symfony\Component\HttpClient\Exception\TimeoutException;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\Response\MockResponse;
 
@@ -124,4 +125,34 @@ public function testCancelingAMockResponseNotIssuedByMockHttpClient()
 
         $this->assertTrue($mockResponse->getInfo('canceled'));
     }
+
+    public function testTimeoutHeader()
+    {
+        $response = MockResponse::fromRequest('GET', 'http://symfony.com', [], new MockResponse(['']));
+
+        try {
+            $response->getStatusCode();
+            $this->fail(TimeoutException::class.' expected');
+        } catch (TimeoutException $e) {
+        }
+
+        $this->assertSame('Idle timeout reached for "http://symfony.com".', $response->getInfo('error'));
+    }
+
+    public function testTimeoutBody()
+    {
+        $response = MockResponse::fromRequest('GET', 'http://symfony.com', [], new MockResponse(['content', '']));
+
+        try {
+            $this->assertSame(200, $response->getStatusCode());
+        } catch (TimeoutException $e) {
+            $this->fail(TimeoutException::class.' was not expected');
+        }
+
+        try {
+            $response->getContent();
+            $this->fail(TimeoutException::class.' expected');
+        } catch (TimeoutException $e) {
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -90,17 +90,11 @@ public function getRequestMethod(): string`
`90`	`90`	`return $this->requestMethod;`
`91`	`91`	`}`
`92`	`92`
`93`		`- /**`
`94`		`- * {@inheritdoc}`
`95`		`- */`
`96`	`93`	`public function getInfo(?string $type = null)`
`97`	`94`	`{`
`98`	`95`	`return null !== $type ? $this->info[$type] ?? null : $this->info;`
`99`	`96`	`}`
`100`	`97`
`101`		`- /**`
`102`		`- * {@inheritdoc}`
`103`		`- */`
`104`	`98`	`public function cancel(): void`
`105`	`99`	`{`
`106`	`100`	`$this->info['canceled'] = true;`
`@@ -116,9 +110,6 @@ public function cancel(): void`
`116`	`110`	`$onProgress($this->offset, $dlSize, $this->info);`
`117`	`111`	`}`
`118`	`112`
`119`		`- /**`
`120`		`- * {@inheritdoc}`
`121`		`- */`
`122`	`113`	`protected function close(): void`
`123`	`114`	`{`
`124`	`115`	`$this->inflate = null;`
`@@ -159,9 +150,6 @@ public static function fromRequest(string $method, string $url, array $options,`
`159`	`150`	`return $response;`
`160`	`151`	`}`
`161`	`152`
`162`		`- /**`
`163`		`- * {@inheritdoc}`
`164`		`- */`
`165`	`153`	`protected static function schedule(self $response, array &$runningResponses): void`
`166`	`154`	`{`
`167`	`155`	`if (!$response->id) {`
`@@ -203,7 +191,7 @@ protected static function perform(ClientState $multi, array &$responses): void`
`203`	`191`	`$chunk[1]->getStatusCode();`
`204`	`192`	`$chunk[1]->getHeaders(false);`
`205`	`193`	`self::readResponse($response, $chunk[0], $chunk[1], $offset);`
`206`		`- $multi->handlesActivity[$id][] = new FirstChunk();`
	`194`	`+ $multi->handlesActivity[$id][] = ($response->body[0] ?? null) instanceof ErrorChunk ? $response->body[0] : new FirstChunk();`
`207`	`195`	`$buffer = $response->requestOptions['buffer'] ?? null;`
`208`	`196`
`209`	`197`	`if ($buffer instanceof \Closure && $response->content = $buffer($response->headers) ?: null) {`
`@@ -223,9 +211,6 @@ protected static function perform(ClientState $multi, array &$responses): void`
`223`	`211`	`}`
`224`	`212`	`}`
`225`	`213`
`226`		`- /**`
`227`		`- * {@inheritdoc}`
`228`		`- */`
`229`	`214`	`protected static function select(ClientState $multi, float $timeout): int`
`230`	`215`	`{`
`231`	`216`	`return 42;`