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

Avoid false positive about array which are non-callable #10935

Merged
merged 4 commits into from
May 5, 2024
+55 −0
Merged

Avoid false positive about array which are non-callable #10935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0776d8c
Avoid false positive about non-callable
VincentLanglet May 3, 2024
0bc6969
Fix
VincentLanglet May 3, 2024
3b512ce
Fix
VincentLanglet May 3, 2024
e97dbab
Feedback
VincentLanglet May 3, 2024
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
27 changes: 27 additions & 0 deletions src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
use Psalm\Type\Union;
use UnexpectedValueException;

use function array_filter;
use function count;
use function explode;
use function implode;
Expand Down Expand Up @@ -955,12 +956,29 @@ public static function verifyType(
) {
$potential_method_ids = [];

$param_types_without_callable = array_filter(
$param_type->getAtomicTypes(),
static fn(Atomic $atomic) => !$atomic instanceof Atomic\TCallableInterface,
);
$param_type_without_callable = [] !== $param_types_without_callable
? new Union($param_types_without_callable)
: null;

foreach ($input_type->getAtomicTypes() as $input_type_part) {
if ($input_type_part instanceof TList) {
$input_type_part = $input_type_part->getKeyedArray();
}

if ($input_type_part instanceof TKeyedArray) {
// If the param accept an array, we don't report arrays as wrong callbacks.
if (null !== $param_type_without_callable && UnionTypeComparator::isContainedBy(
$codebase,
$input_type,
$param_type_without_callable,
)) {
continue;
}

$potential_method_id = CallableTypeComparator::getCallableMethodIdFromTKeyedArray(
$input_type_part,
$codebase,
Expand Down Expand Up @@ -1006,6 +1024,15 @@ public static function verifyType(
} elseif ($input_type_part instanceof TLiteralString
&& strpos($input_type_part->value, '::')
) {
// If the param also accept a string, we don't report string as wrong callbacks.
if (null !== $param_type_without_callable && UnionTypeComparator::isContainedBy(
$codebase,
$input_type,
$param_type_without_callable,
)) {
continue;
}

$parts = explode('::', $input_type_part->value);
/** @psalm-suppress PossiblyUndefinedIntArrayOffset */
$potential_method_id = new MethodIdentifier(
Expand Down
28 changes: 28 additions & 0 deletions tests/CallableTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2210,6 +2210,24 @@ function foo($arg): void {}

foo(["a", "b"]);',
],
'notCallableArray' => [
'code' => '<?php
/**
* @param array{class-string, string}|callable $arg
*/
function foo($arg): void {}

foo([\DateTime::class, "format"]);',
],
'notCallableString' => [
'code' => '<?php
/**
* @param string|callable $arg
*/
function foo($arg): void {}

foo("notACallable");',
],
'callableOptionalOrAdditionalOptional' => [
'code' => '<?php
/**
Expand Down Expand Up @@ -3635,6 +3653,16 @@ public function run($callable) {
}',
'error_message' => 'ParentNotFound',
],
'wrongCallableInUnion' => [
'code' => '<?php
/**
* @param int|callable $arg
*/
function foo($arg): void {}

foo([\DateTime::class, "wrongMethod"]);',
'error_message' => 'InvalidArgument',
],
];
}
}
Loading