[HttpClient] Fix handling thrown \Exception in \Generator in MockResponse

fancyweb · fancyweb · commit 3beaf09cd9d0 · 2021-12-11T11:30:07.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Response/MockResponse.php b/src/Symfony/Component/HttpClient/Response/MockResponse.php
@@ -38,7 +38,7 @@ class MockResponse implements ResponseInterface
     /**
      * @param string|string[]|iterable $body The response body as a string or an iterable of strings,
      *                                       yielding an empty string simulates an idle timeout,
-     *                                       exceptions are turned to TransportException
+     *                                       exceptions are turned to ErrorChunk
      *
      * @see ResponseInterface::getInfo() for possible info, e.g. "response_headers"
      */
diff --git a/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\HttpClient\Tests;
 
+use Symfony\Component\HttpClient\Chunk\ErrorChunk;
 use Symfony\Component\HttpClient\Exception\TransportException;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
@@ -63,6 +64,44 @@ public function invalidResponseFactoryProvider()
         ];
     }
 
+    public function testThrowExceptionInBodyGenerator()
+    {
+        $mockHttpClient = new MockHttpClient([
+            new MockResponse((static function (): \Generator {
+                yield 'foo';
+                throw new TransportException('foo ccc');
+            })()),
+            new MockResponse((static function (): \Generator {
+                yield 'bar';
+                throw new \RuntimeException('bar ccc');
+            })()),
+        ]);
+
+        try {
+            $mockHttpClient->request('GET', 'https://symfony.com', [])->getContent();
+            $this->fail();
+        } catch (TransportException $e) {
+            $this->assertEquals(new TransportException('foo ccc'), $e->getPrevious());
+            $this->assertSame('foo ccc', $e->getMessage());
+        }
+
+        $chunks = [];
+        try {
+            foreach ($mockHttpClient->stream($mockHttpClient->request('GET', 'https://symfony.com', [])) as $chunk) {
+                $chunks[] = $chunk;
+            }
+            $this->fail();
+        } catch (TransportException $e) {
+            $this->assertEquals(new \RuntimeException('bar ccc'), $e->getPrevious());
+            $this->assertSame('bar ccc', $e->getMessage());
+        }
+
+        $this->assertCount(1, $chunks);
+        $this->assertInstanceOf(ErrorChunk::class, $chunks[0]);
+        $this->assertSame(0, $chunks[0]->getOffset());
+        $this->assertSame('bar ccc', $chunks[0]->getError());
+    }
+
     protected function getHttpClient(string $testCase): HttpClientInterface
     {
         $responses = [];

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class MockResponse implements ResponseInterface`
`38`	`38`	`/**`
`39`	`39`	`* @param string\|string[]\|iterable $body The response body as a string or an iterable of strings,`
`40`	`40`	`* yielding an empty string simulates an idle timeout,`
`41`		`- * exceptions are turned to TransportException`
	`41`	`+ * exceptions are turned to ErrorChunk`
`42`	`42`	`*`
`43`	`43`	`* @see ResponseInterface::getInfo() for possible info, e.g. "response_headers"`
`44`	`44`	`*/`