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

Be more robust in the case of missing parent class

Browse Source
This commit is contained in:
Matthew Brown 2017-01-15 22:09:32 -05:00
parent f614944b63
commit de9d282205
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Checker/ClassLikeChecker.php
View File

@ -462,12 +462,15 @@ abstract class ClassLikeChecker extends SourceChecker implements StatementsSourc
);
if (!$config->excludeIssueInFile('InvalidReturnType', $source->getFileName())) {
$return_type_location = null;
$secondary_return_type_location = null;
$return_type_location = MethodChecker::getMethodReturnTypeLocation(
$actual_method_id,
$secondary_return_type_location
);
if ($actual_method_id) {
$return_type_location = MethodChecker::getMethodReturnTypeLocation(
$actual_method_id,
$secondary_return_type_location
);
}
$method_checker->verifyReturnType(
$update_docblocks,

14
src/Psalm/Checker/MethodChecker.php
View File

@ -89,9 +89,12 @@ class MethodChecker extends FunctionLikeChecker
*/
public static function getMethodReturnType($method_id)
{
/** @var string */
$method_id = self::getDeclaringMethodId($method_id);
if (!$method_id) {
return null;
}
list($fq_class_name, $method_name) = explode('::', $method_id);
if (!ClassLikeChecker::isUserDefined($fq_class_name) && FunctionChecker::inCallMap($method_id)) {
@ -134,9 +137,12 @@ class MethodChecker extends FunctionLikeChecker
*/
public static function getMethodReturnTypeLocation($method_id, CodeLocation &$defined_location = null)
{
/** @var string */
$method_id = self::getDeclaringMethodId($method_id);
if ($method_id === null) {
return null;
}
$storage = self::getStorage($method_id);
if (!$storage) {
@ -356,6 +362,10 @@ class MethodChecker extends FunctionLikeChecker
$fq_class_name_lower = strtolower($fq_class_name);
if (!isset(ClassLikeChecker::$storage[$fq_class_name_lower])) {
throw new \UnexpectedValueException('$class_storage should not be null for ' . $method_id);
}
$class_storage = ClassLikeChecker::$storage[$fq_class_name_lower];
if (!isset($class_storage->methods[strtolower($method_name)])) {