Skip to content

Skip scope type lookup for expressions without nullsafe operators #6104

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
staabm wants to merge 1 commit into from
+8 −1
Closed

Skip scope type lookup for expressions without nullsafe operators #6104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/Analyser/NullsafeOperatorHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,20 @@ final class NullsafeOperatorHelper

public static function getNullsafeShortcircuitedExprRespectingScope(Scope $scope, Expr $expr): Expr
{
$shortcircuitedExpr = self::getNullsafeShortcircuitedExpr($expr);
if ($shortcircuitedExpr === $expr) {
// No nullsafe operator anywhere in the expression - the result is $expr
// either way, so skip asking the scope for the expression's type.
return $expr;
}

if (!TypeCombinator::containsNull($scope->getType($expr))) {
// We're in most likely in context of a null-safe operator ($scope->moreSpecificType is defined for $expr)
// Modifying the expression would not bring any value or worse ruin the context information
return $expr;
}

return self::getNullsafeShortcircuitedExpr($expr);
return $shortcircuitedExpr;
}

/**
Expand Down
Loading