Skip to content

Prevent unnecessary work #4868

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
ondrejmirtes merged 2 commits into from
Feb 11, 2026
Merged

Prevent unnecessary work #4868

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
3125907
VoidToNullTraverser: Intersections cannot contain void
staabm Feb 11, 2026
191a622
Prevent unnecessary type-traversal
staabm Feb 11, 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
8 changes: 8 additions & 0 deletions src/Analyser/MutatingScope.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5048,6 +5048,9 @@ private function exactInstantiation(New_ $node, Name $className): Type

$traverser = new ConstructorClassTemplateTraverser($classTemplateTypes);
foreach ($constructorVariant->getParameters() as $parameter) {
if (!$parameter->getType()->hasTemplateOrLateResolvableType()) {
continue;
}
TypeTraverser::map($parameter->getType(), $traverser);
}
$classTemplateTypes = $traverser->getClassTemplateTypes();
Expand Down Expand Up @@ -5219,6 +5222,11 @@ classReflection: $classReflection->withTypes($types)->asFinal(),
[],
);
}

if (!$newGenericType->hasTemplateOrLateResolvableType()) {
return $newGenericType;
}

return TypeTraverser::map($newGenericType, new GenericTypeTemplateTraverser($resolvedTemplateTypeMap));
}

Expand Down
3 changes: 1 addition & 2 deletions src/Analyser/Traverser/VoidToNullTraverser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

namespace PHPStan\Analyser\Traverser;

use PHPStan\Type\IntersectionType;
use PHPStan\Type\NullType;
use PHPStan\Type\Type;
use PHPStan\Type\TypeTraverserCallable;
Expand All @@ -16,7 +15,7 @@ final class VoidToNullTraverser implements TypeTraverserCallable
*/
public function traverse(Type $type, callable $traverse): Type
{
if ($type instanceof UnionType || $type instanceof IntersectionType) {
if ($type instanceof UnionType) {
return $traverse($type);
}

Expand Down
Loading