Skip to content

Fix for output buffering issue #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shandak wants to merge 2 commits into from
Closed

Fix for output buffering issue #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c9bda0
Fix output buffering issue
shandak Jun 30, 2021
b7a4f9d
formatting code
shandak Jun 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions lib/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,23 @@ function await(Promise|array $promise): mixed
$promise = Promise\all($promise);
}

$fiber = \Fiber::this();
$fiber = \Fiber::getCurrent();
$resolved = false;

if ($fiber) { // Awaiting from within a fiber.
if ($fiber === Loop::getFiber()) {
throw new \Error(\sprintf('Cannot call %s() within an event loop callback', __FUNCTION__));
}

$promise->onResolve(static function (?\Throwable $exception, mixed $value) use (&$resolved, $fiber): void {
$hash = spl_object_hash($fiber);
$level = ob_get_level();

if ($level)
{
Loop::setState($hash . '-key', $level);
}

$promise->onResolve(static function (?\Throwable $exception, mixed $value) use (&$resolved, $fiber, $hash): void {
$resolved = true;

if ($exception) {
Expand All @@ -45,8 +53,32 @@ function await(Promise|array $promise): mixed
});

try {
if (Loop::getState($hash . '-key'))
{
$content = ob_get_contents();

if ($content !== '')
{
Loop::setState($hash . '-content', $content);
}

ob_end_clean();
}

// Suspend the current fiber until the promise is resolved.
$value = \Fiber::suspend();

if (Loop::getState($hash . '-key'))
{
ob_start();
$content = Loop::getState($hash . '-content');

if (!is_null($content))
{
echo $content;
Loop::setState($hash . '-content', null);
}
}
} finally {
if (!$resolved) {
// $resolved should only be false if the fiber was manually resumed outside of the callback above.
Expand Down