Skip to content

Prevent unnecessary work in TypeTraverser::map() callbacks #4660

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

Open
staabm wants to merge 2 commits into
base: 2.1.x
Choose a base branch
from
+13 −6
Open

Prevent unnecessary work in TypeTraverser::map() callbacks #4660

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
aebf71b
Prevent unnecessary work in TypeTraverser::map() callbacks
staabm Dec 23, 2025
4059f7e
Update MutatingScope.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
11 changes: 8 additions & 3 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3231,12 +3231,17 @@ public function enterPropertyHook(

private function transformStaticType(Type $type): Type
{
if (!$this->isInClass()) {
return $type;
}

return TypeTraverser::map($type, function (Type $type, callable $traverse): Type {
if (!$this->isInClass()) {
return $type;
}
if ($type instanceof StaticType) {
$classReflection = $this->getClassReflection();
if ($classReflection === null) {
throw new ShouldNotHappenException();
}

$changedType = $type->changeBaseClass($classReflection);
if ($classReflection->isFinal() && !$type instanceof ThisType) {
$changedType = $changedType->getStaticObjectType();
Expand Down
8 changes: 5 additions & 3 deletions src/Reflection/InitializerExprTypeResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2400,9 +2400,11 @@ public function getClassConstFetchTypeByReflection(Name|Expr $class, string $con
}

if (strtolower($constantName) === 'class') {
$reflectionProvider = $this->getReflectionProvider();

return TypeTraverser::map(
$constantClassType,
function (Type $type, callable $traverse): Type {
static function (Type $type, callable $traverse) use ($reflectionProvider): Type {
if ($type instanceof UnionType || $type instanceof IntersectionType) {
return $traverse($type);
}
Expand All @@ -2428,8 +2430,8 @@ function (Type $type, callable $traverse): Type {
new GenericClassStringType($type),
new AccessoryLiteralStringType(),
);
} elseif ($objectClassNames !== [] && $this->getReflectionProvider()->hasClass($objectClassNames[0])) {
$reflection = $this->getReflectionProvider()->getClass($objectClassNames[0]);
} elseif ($objectClassNames !== [] && $reflectionProvider->hasClass($objectClassNames[0])) {
$reflection = $reflectionProvider->getClass($objectClassNames[0]);
if ($reflection->isFinalByKeyword()) {
return new ConstantStringType($reflection->getName(), true);
}
Expand Down
Loading