Cover empty body buffer flush

yiisoft · Feb 27, 2024 · 3ed2f01 · 3ed2f01
1 parent 04f920f
commit 3ed2f01
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/src/SapiEmitter.php b/src/SapiEmitter.php
@@ -121,6 +121,9 @@ private function emitBody(ResponseInterface $response): void
         while (!$body->eof()) {
             $output = $body->read($this->bufferSize);
             if ($output === '') {
+                while (ob_get_level() > $level) {
+                    ob_end_flush();
+                }
                 continue;
             }
             echo $output;

diff --git a/tests/SapiEmitterTest.php b/tests/SapiEmitterTest.php
@@ -259,15 +259,30 @@ public function testObLevel(): void
         $this->assertSame($expectedLevel, $actualLevel);
     }
 
-    public function testExtraObLevel(): void
+    public static function dataExtraObLevel(): iterable
+    {
+        yield 'empty response' => [
+            '',
+            1,
+        ];
+        yield 'some response' => [
+            'Example body',
+            2,
+        ];
+    }
+
+    /**
+     * @dataProvider dataExtraObLevel
+     */
+    public function testExtraObLevel(string $responseBody, int $expectedFlushes): void
     {
         $expectedLevel = ob_get_level();
         $stream = $this->createMock(StreamInterface::class);
-        $stream->method('read')->willReturnCallback(static function () {
+        $stream->method('read')->willReturnCallback(static function () use ($responseBody) {
             ob_start();
             ob_start();
             ob_start();
-            return '-';
+            return $responseBody;
         });
         $stream->method('isReadable')->willReturn(true);
         $stream->method('eof')->willReturnOnConsecutiveCalls(false, true);
@@ -281,6 +296,7 @@ public function testExtraObLevel(): void
 
         $actualLevel = ob_get_level();
         $this->assertSame($expectedLevel, $actualLevel);
+        $this->assertSame($expectedFlushes, HTTPFunctions::getFlushTimes());
     }
 
     public function testFlushWithBody(): void