Skip to content

Prevent resolving conditional types in callable param/return types #3405

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
merged 1 commit into from
Sep 5, 2024
Merged

Prevent resolving conditional types in callable param/return types #3405

Show file tree
Hide file tree
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
15 changes: 13 additions & 2 deletions src/Type/TypeUtils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,11 +411,22 @@ public static function containsTemplateType(Type $type): bool

public static function resolveLateResolvableTypes(Type $type, bool $resolveUnresolvableTypes = true): Type
{
return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($resolveUnresolvableTypes): Type {
while ($type instanceof LateResolvableType && ($resolveUnresolvableTypes || $type->isResolvable())) {
/** @var int $ignoreResolveUnresolvableTypesLevel */
$ignoreResolveUnresolvableTypesLevel = 0;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just do @var int here :)


return TypeTraverser::map($type, static function (Type $type, callable $traverse) use ($resolveUnresolvableTypes, &$ignoreResolveUnresolvableTypesLevel): Type {
while ($type instanceof LateResolvableType && (($resolveUnresolvableTypes && $ignoreResolveUnresolvableTypesLevel === 0) || $type->isResolvable())) {
$type = $type->resolve();
}

if ($type instanceof CallableType || $type instanceof ClosureType) {
$ignoreResolveUnresolvableTypesLevel++;
$result = $traverse($type);
$ignoreResolveUnresolvableTypesLevel--;

return $result;
}

return $traverse($type);
});
}
Expand Down
18 changes: 18 additions & 0 deletions tests/PHPStan/Analyser/nsrt/bug-11472.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php declare(strict_types = 1); // lint >= 8.1

namespace Bug11472;

use function PHPStan\Testing\assertType;

/**
* @phpstan-return ($maybeFoo is 'foo' ? true : false)
*/
function isFoo(mixed $maybeFoo): bool
{
return $maybeFoo === 'foo';
}

function (): void {
assertType('true', isFoo('foo'));
assertType('true', isFoo(...)('foo'));
};
Loading