Skip to content

Simplify FiberNodeScopeResolver #4659

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

Merged
ondrejmirtes merged 4 commits into from
Dec 23, 2025
Merged

Simplify FiberNodeScopeResolver #4659

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9dd4fdf
Simplify FiberNodeScopeResolver
staabm Dec 23, 2025
d15a227
Update FiberNodeScopeResolver.php
staabm Dec 23, 2025
d4e5e73
Update FiberNodeScopeResolver.php
staabm Dec 23, 2025
5351b04
Revert "Update FiberNodeScopeResolver.php"
staabm Dec 23, 2025
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
34 changes: 15 additions & 19 deletions src/Analyser/Fiber/FiberNodeScopeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ private function runFiberForNodeCallback(

protected function processPendingFibers(ExpressionResultStorage $storage): void
{
start:

foreach ($storage->pendingFibers as $pending) {
$request = $pending['request'];
$beforeScope = $storage->findBeforeScope($request->expr);
Expand All @@ -99,36 +101,30 @@ protected function processPendingFibers(ExpressionResultStorage $storage): void
if ($storage->findBeforeScope($request->expr) === null) {
throw new ShouldNotHappenException(sprintf('processExprNode should have stored the beforeScope of %s on line %s', get_class($request->expr), $request->expr->getStartLine()));
}
$this->processPendingFibers($storage);

// Break and restart the loop since the array may have been modified
return;
goto start;
}
}

protected function processPendingFibersForRequestedExpr(ExpressionResultStorage $storage, Expr $expr, Scope $result): void
{
$restartLoop = true;

while ($restartLoop) {
$restartLoop = false;
start:

foreach ($storage->pendingFibers as $key => $pending) {
$request = $pending['request'];
if ($request->expr !== $expr) {
continue;
}
foreach ($storage->pendingFibers as $key => $pending) {
$request = $pending['request'];
if ($request->expr !== $expr) {
continue;
}

unset($storage->pendingFibers[$key]);
$restartLoop = true;
unset($storage->pendingFibers[$key]);

$fiber = $pending['fiber'];
$request = $fiber->resume($result);
$this->runFiberForNodeCallback($storage, $fiber, $request);
$fiber = $pending['fiber'];
$request = $fiber->resume($result);
$this->runFiberForNodeCallback($storage, $fiber, $request);

// Break and restart the loop since the array may have been modified
break;
}
// Break and restart the loop since the array may have been modified
goto start;
}
}

Expand Down
Loading