Skip to content
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

Jump to bottom

Fix faulty comparison with typed closure #7175

Merged
merged 1 commit into from Dec 16, 2021
Merged

Fix faulty comparison with typed closure #7175

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
40 changes: 12 additions & 28 deletions src/Psalm/Internal/Type/Comparator/AtomicTypeComparator.php
View file
Open in desktop
Expand Up @@ -165,40 +165,24 @@ public static function isContainedBy(
);
}

if ($container_type_part instanceof TClosure && $input_type_part instanceof TCallable) {
if (CallableTypeComparator::isContainedBy(
$codebase,
$input_type_part,
$container_type_part,
$atomic_comparison_result
) === false
) {
return false;
}

if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced = true;
}

return false;
}

if ($container_type_part instanceof TClosure) {
if (!$input_type_part instanceof TClosure) {
if ($input_type_part instanceof TCallable) {
if (CallableTypeComparator::isContainedBy(
$codebase,
$input_type_part,
$container_type_part,
$atomic_comparison_result
) === false
) {
return false;
}

if ($atomic_comparison_result) {
$atomic_comparison_result->type_coerced = true;
$atomic_comparison_result->type_coerced_from_mixed = true;
}

return false;
}

return CallableTypeComparator::isContainedBy(
$codebase,
$input_type_part,
$container_type_part,
$atomic_comparison_result
);
return false;
}

if ($container_type_part instanceof TCallable && $input_type_part instanceof TClosure) {
Expand Down
8 changes: 8 additions & 0 deletions tests/ClosureTest.php
View file
Open in desktop
Expand Up @@ -1043,6 +1043,14 @@ function (): void {};
false,
'7.4'
],
'closureInvalidArg' => [
'<?php
/** @param Closure(int): string $c */
function takesClosure(Closure $c): void {}

takesClosure(5);',
'error_message' => 'InvalidArgument',
],
];
}
}