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

Report first class callables generated for unknown static methods #10691

Merged
merged 2 commits into from
Feb 11, 2024
Merged

Report first class callables generated for unknown static methods #10691

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
d10e384
Report first class callables generated for unknown static methods
weirdan Feb 11, 2024
a8c093a
Handle taking references to unspecified magic methods
weirdan Feb 11, 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: 26 additions & 1 deletion ...lm/Internal/Analyzer/Statements/Expression/Call/StaticMethod/AtomicStaticCallAnalyzer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use Psalm\Issue\InvalidStringClass;
use Psalm\Issue\MixedMethodCall;
use Psalm\Issue\UndefinedClass;
use Psalm\Issue\UndefinedMethod;
use Psalm\IssueBuffer;
use Psalm\Node\Expr\VirtualArray;
use Psalm\Node\Expr\VirtualArrayItem;
Expand Down Expand Up @@ -490,6 +491,7 @@ private static function handleNamedCall(
$method_name_lc,
);


if ($stmt->isFirstClassCallable()) {
if ($found_method_and_class_storage) {
[ $method_storage ] = $found_method_and_class_storage;
Expand All @@ -515,8 +517,31 @@ private static function handleNamedCall(
$codebase->getMethodReturnType($method_id, $fq_class_name),
$codebase->methods->getStorage($declaring_method_id)->pure,
)]);
} elseif ($codebase->methodExists(
$call_static_method_id = new MethodIdentifier($method_id->fq_class_name, '__callstatic'),
new CodeLocation($statements_analyzer, $stmt),
null,
null,
false,
)) {
$return_type_candidate = new Union([new TClosure(
'Closure',
null,
$codebase->getMethodReturnType($call_static_method_id, $fq_class_name),
$codebase->methods->getStorage($call_static_method_id)->pure,
)]);
} else {
// FIXME: perhaps Psalm should complain about nonexisting method here, or throw a logic exception?
if (IssueBuffer::accepts(
new UndefinedMethod(
'Method ' . $method_id . ' does not exist',
new CodeLocation($statements_analyzer, $stmt),
(string) $method_id,
),
$statements_analyzer->getSuppressedIssues(),
)) {
return false;
}

$return_type_candidate = Type::getClosure();
}
}
Expand Down
16 changes: 16 additions & 0 deletions tests/MethodCallTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1805,6 +1805,22 @@ public function foo(callable $_a = "strlen"): void {}
PHP,
'error_message' => 'TooManyArguments',
],
'firstClassCallableWithUnknownStaticMethod' => [
'code' => <<<'PHP'
<?php
class A {}
$_a = A::foo(...);
PHP,
'error_message' => 'UndefinedMethod',
],
'firstClassCallableWithUnknownInstanceMethod' => [
'code' => <<<'PHP'
<?php
class A {}
$_a = (new A)->foo(...);
PHP,
'error_message' => 'UndefinedMethod',
],
];
}
}