Skip to content

ForeachEmptyOrObjectNarrowingHelper: Prevent unnecessary work #6766

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
staabm merged 2 commits into from
Oct 20, 2026
+4 −4
Merged

ForeachEmptyOrObjectNarrowingHelper: Prevent unnecessary work #6766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
536f37b
ForeachEmptyOrObjectNarrowingHelper: Prevent unnecessary work
staabm Oct 20, 2026
eb7a6c3
Bump expected turbo version
staabm Oct 20, 2026
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
2 changes: 1 addition & 1 deletion src/Analyser/ExprHandler/Helper/ForeachEmptyOrObjectNarrowingHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,12 +99,12 @@ private function composeScope(
if ($leftTruthyTypes === null || $leftFalseyTypes === null) {
return null;
}
$leftTruthyScope = $scope->applySpecifiedTypes($leftTruthyTypes->setRootExpr($identical));
$leftFalseyScope = $scope->applySpecifiedTypes($leftFalseyTypes->setRootExpr($identical));
$rightTruthyTypes = $rightTypes($leftFalseyScope, TypeSpecifierContext::createTruthy());
if ($rightTruthyTypes === null) {
return null;
}
$leftTruthyScope = $scope->applySpecifiedTypes($leftTruthyTypes->setRootExpr($identical));
$rightTruthyScope = $leftFalseyScope->applySpecifiedTypes($rightTruthyTypes->setRootExpr($isObjectCall));

$types = $this->booleanNarrowingHelper->specifyDisjunction(
Expand Down
2 changes: 1 addition & 1 deletion src/Turbo/TurboExtensionEnabler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
final class TurboExtensionEnabler
{

public const EXPECTED_EXTENSION_VERSION = '80f2bb1';
public const EXPECTED_EXTENSION_VERSION = '536f37b';

private static bool $active = false;

Expand Down
4 changes: 2 additions & 2 deletions turbo-ext/src/ForeachEmptyOrObjectNarrowingHelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,13 +317,13 @@ class ForeachEmptyOrObjectNarrowingHelper
zv::Val leftFalseyTypes = leftTypesOf(leftCaptures, scope, &falsey);
if (UNEXPECTED(leftFalseyTypes.isUndef())) return zv::Val();
if (leftTruthyTypes.isNull() || leftFalseyTypes.isNull()) return zv::Val::null();
zv::Val leftTruthyScope = applyRooted(scope, leftTruthyTypes.raw(), identical);
if (UNEXPECTED(leftTruthyScope.isUndef())) return zv::Val();
zv::Val leftFalseyScope = applyRooted(scope, leftFalseyTypes.raw(), identical);
if (UNEXPECTED(leftFalseyScope.isUndef())) return zv::Val();
zv::Val rightTruthyTypes = rightTypesOf(rightCaptures, leftFalseyScope.raw(), &truthy);
if (UNEXPECTED(rightTruthyTypes.isUndef())) return zv::Val();
if (rightTruthyTypes.isNull()) return zv::Val::null();
zv::Val leftTruthyScope = applyRooted(scope, leftTruthyTypes.raw(), identical);
if (UNEXPECTED(leftTruthyScope.isUndef())) return zv::Val();
zv::Val rightTruthyScope = applyRooted(leftFalseyScope.raw(), rightTruthyTypes.raw(), isObjectCall);
if (UNEXPECTED(rightTruthyScope.isUndef())) return zv::Val();

Expand Down
Loading