danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Add slight kludge if method is nullable

Browse Source
This commit is contained in:
Matthew Brown 2016-07-11 10:15:32 -04:00
parent 348e06ffb9
commit 04be1fb50e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/CodeInspector/ClassMethodChecker.php
View File

@ -258,15 +258,24 @@ class ClassMethodChecker extends FunctionChecker
if ($docblock_info['params']) { if ($docblock_info['params']) {
foreach ($docblock_info['params'] as $docblock_param) { foreach ($docblock_info['params'] as $docblock_param) {
$param_name = $docblock_param['name']; $docblock_param_name = $docblock_param['name'];
$param_type = $docblock_param['type'];
if (isset($method_param_names[$param_name])) { if (isset($method_param_names[$param_name])) {
foreach (self::$_method_params[$method_id] as &$param_info) { foreach (self::$_method_params[$method_id] as &$param_info) {
if ($param_info['name'] === $param_name) { if ($param_info['name'] === $docblock_param_name) {
$param_info['type'] = Type::parseString( $docblock_param_type_string = $docblock_param['type'];
self::_fixUpReturnType($docblock_param['type'], $method_id)
$existing_param_type = $param_info['type'];
$new_param_type = Type::parseString(
self::_fixUpReturnType($docblock_param_type_string, $method_id)
); );
if ($existing_param_type->isNullable() && !$new_param_type->isNullable()) {
$new_param_type->types['null'] = Type::getNull(false);
}
$param_info['type'] = $new_param_type;
} }
} }
} }