WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Don't store scalar values in resolvedTypes #4676

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

Draft
staabm wants to merge 3 commits into
base: 2.1.x
Choose a base branch
from
Draft

Don't store scalar values in resolvedTypes #4676

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1f2e3e
Don't store scalar values in resolvedTypes
staabm Dec 28, 2025
a1a8c1c
Update MutatingScope.php
staabm Dec 28, 2025
0c1bb0f
Update MutatingScope.php
staabm Dec 28, 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
33 changes: 16 additions & 17 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,6 +797,21 @@ public function getAnonymousFunctionReturnType(): ?Type
/** @api */
public function getType(Expr $node): Type
{
if ($node instanceof Node\Scalar\Int_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof String_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof Node\Scalar\Float_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof Expr\UnaryMinus && $node->expr instanceof Node\Scalar) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof ConstFetch) {
$loweredConstName = strtolower($node->name->toString());
if (in_array($loweredConstName, ['true', 'false', 'null'], true)) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
}
}

if ($node instanceof GetIterableKeyTypeExpr) {
return $this->getIterableKeyType($this->getType($node->getExpr()));
}
Expand Down Expand Up @@ -1295,11 +1310,7 @@ private function resolveType(string $exprString, Expr $node): Type
});
}

if ($node instanceof Node\Scalar\Int_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof String_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof Node\Scalar\InterpolatedString) {
if ($node instanceof Node\Scalar\InterpolatedString) {
$resultType = null;
foreach ($node->parts as $part) {
if ($part instanceof InterpolatedStringPart) {
Expand All @@ -1316,8 +1327,6 @@ private function resolveType(string $exprString, Expr $node): Type
}

return $resultType ?? new ConstantStringType('');
} elseif ($node instanceof Node\Scalar\Float_) {
return $this->initializerExprTypeResolver->getType($node, InitializerExprContext::fromScope($this));
} elseif ($node instanceof Expr\CallLike && $node->isFirstClassCallable()) {
if ($node instanceof FuncCall && $node->name instanceof Expr) {
$callableType = $this->getType($node->name);
Expand Down Expand Up @@ -2039,16 +2048,6 @@ static function (Node $node, Scope $scope) use ($arrowScope, &$arrowFunctionImpu
}

if ($node instanceof ConstFetch) {
$constName = (string) $node->name;
$loweredConstName = strtolower($constName);
if ($loweredConstName === 'true') {
return new ConstantBooleanType(true);
} elseif ($loweredConstName === 'false') {
return new ConstantBooleanType(false);
} elseif ($loweredConstName === 'null') {
return new NullType();
}

$namespacedName = null;
if (!$node->name->isFullyQualified() && $this->getNamespace() !== null) {
$namespacedName = new FullyQualified([$this->getNamespace(), $node->name->toString()]);
Expand Down
Loading