Skip to content

MutatingScope: Reduce duplicate expression printing #4727

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 2 commits into from
+17 −5
Closed

MutatingScope: Reduce duplicate expression printing #4727

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
061c003
MutatingScope: Reduce duplicate expression printing
staabm Jan 6, 2026
a00c3b1
Simplify
staabm Jan 6, 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
22 changes: 17 additions & 5 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,7 @@ private function resolveType(string $exprString, Expr $node): Type
!$node instanceof Variable
&& !$node instanceof Expr\Closure
&& !$node instanceof Expr\ArrowFunction
&& $this->hasExpressionType($node)->yes()
&& $this->hasExpressionTypeByString($exprString, $node)->yes()
) {
return $this->expressionTypes[$exprString]->getType();
}
Expand Down Expand Up @@ -2074,10 +2074,11 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
continue;
}
$constFetch = new ConstFetch($name);
if ($this->hasExpressionType($constFetch)->yes()) {
$constExprString = $this->getNodeKey($constFetch);
if ($this->hasExpressionTypeByString($constExprString, $constFetch)->yes()) {
return $this->constantResolver->resolveConstantType(
$name->toString(),
$this->expressionTypes[$this->getNodeKey($constFetch)]->getType(),
$this->expressionTypes[$constExprString]->getType(),
);
}
}
Expand All @@ -2089,7 +2090,7 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu

return new ErrorType();
} elseif ($node instanceof Node\Expr\ClassConstFetch && $node->name instanceof Node\Identifier) {
if ($this->hasExpressionType($node)->yes()) {
if ($this->hasExpressionTypeByString($exprString, $node)->yes()) {
return $this->expressionTypes[$exprString]->getType();
}
return $this->initializerExprTypeResolver->getClassConstFetchTypeByReflection(
Expand Down Expand Up @@ -2924,7 +2925,18 @@ public function hasExpressionType(Expr $node): TrinaryLogic
return $this->hasVariableType($node->name);
}

$exprString = $this->getNodeKey($node);
return $this->hasExpressionTypeByString(
$this->getNodeKey($node),
$node,
);
}

private function hasExpressionTypeByString(string $exprString, Expr $node): TrinaryLogic
{
if ($node instanceof Variable) {
throw new ShouldNotHappenException();
}

if (!isset($this->expressionTypes[$exprString])) {
return TrinaryLogic::createNo();
}
Expand Down
Loading