danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Only update type from docblock if it gives more info

Browse Source
This commit is contained in:
Matthew Brown 2016-07-11 19:57:01 -04:00
parent 6e2fc6141a
commit 32f07fd823
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/CodeInspector/ClassMethodChecker.php
View File

@ -269,17 +269,22 @@ class ClassMethodChecker extends FunctionChecker
$docblock_param_type_string = $docblock_param['type'];
$existing_param_type = $param_info['type'];
$existing_param_type_nullable = $param_info['is_nullable'];
$new_param_type = Type::parseString(
self::_fixUpReturnType($docblock_param_type_string, $method_id)
);
if ($existing_param_type_nullable && !$new_param_type->isNullable()) {
$new_param_type->types['null'] = Type::getNull(false);
// only fix the type if we're dealing with an undefined or generic type
if ($existing_param_type->isMixed() || $new_param_type->hasGeneric()) {
$existing_param_type_nullable = $param_info['is_nullable'];
if ($existing_param_type_nullable && !$new_param_type->isNullable()) {
$new_param_type->types['null'] = Type::getNull(false);
}
$param_info['type'] = $new_param_type;
}
$param_info['type'] = $new_param_type;
}
}
}