danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Don’t give up after method_exists if static method exists

Browse Source
This commit is contained in:
Brown 2019-01-23 15:50:12 -05:00
parent 59baa53b3d
commit 60e9d4f245
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Psalm/Internal/Analyzer/Statements/Expression/Call/StaticCallAnalyzer.php
View File

@ -241,7 +241,7 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
$lhs_type = $stmt->class->inferredType;
}
if (!$context->check_methods || !$lhs_type) {
if (!$lhs_type) {
if (self::checkFunctionArguments(
$statements_analyzer,
$stmt->args,
@ -476,6 +476,20 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
$method_id = $fq_class_name . '::__callstatic';
}
if (!$context->check_methods) {
if (self::checkFunctionArguments(
$statements_analyzer,
$stmt->args,
null,
null,
$context
) === false) {
return false;
}
return null;
}
}
$does_method_exist = MethodAnalyzer::checkMethodExists(
@ -487,7 +501,7 @@ class StaticCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expression\
);
if (!$does_method_exist) {
return $does_method_exist;
return false;
}
$class_storage = $codebase->classlike_storage_provider->get($fq_class_name);

21
tests/MethodCallTest.php
View File

@ -248,6 +248,27 @@ class MethodCallTest extends TestCase
[],
'error_levels' => ['MixedMethodCall', 'MissingParamType'],
],
'staticCallAfterMethodExists' => [
'<?php
class A
{
protected static function existing() : string
{
return "hello";
}
protected static function foo() : string
{
if (!method_exists(static::class, "maybeExists")) {
return "hello";
}
self::maybeExists();
return static::existing();
}
}'
],
];
}