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

Fix fleshing out of variable type

Browse Source
This commit is contained in:
Matthew Brown 2016-07-18 19:04:51 -04:00
parent 0a7f39715c
commit 840adbc4ce
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/CodeInspector/ClassMethodChecker.php
View File

@ -59,7 +59,12 @@ class ClassMethodChecker extends FunctionChecker
$method_id = $this->_absolute_class . '::' . $this->_function->name;
$declared_return_type = self::getMethodReturnTypes($method_id);
// passing it through fleshOutReturnTypes eradicates errant $ vars
$declared_return_type = StatementsChecker::fleshOutReturnTypes(
self::getMethodReturnTypes($method_id),
[],
$method_id
);
if ($declared_return_type) {
$inferred_return_types = EffectsAnalyser::getReturnTypes($this->_function->stmts, true);

20
src/CodeInspector/StatementsChecker.php
View File

@ -1356,10 +1356,11 @@ class StatementsChecker
default:
if (ClassChecker::classImplements($return_type->value, 'Iterator')) {
$iterator_class_type = ClassMethodChecker::getMethodReturnTypes($return_type->value . '::current');
$iterator_method = $return_type->value . '::current';
$iterator_class_type = ClassMethodChecker::getMethodReturnTypes($iterator_method);
if ($iterator_class_type) {
$value_type = $iterator_class_type;
$value_type = self::fleshOutReturnTypes($iterator_class_type, [], $iterator_method);
}
}
@ -1903,7 +1904,7 @@ class StatementsChecker
$return_types = ClassMethodChecker::getMethodReturnTypes($method_id);
if ($return_types) {
$return_types = self::_fleshOutReturnTypes($return_types, $stmt->args, $method_id);
$return_types = self::fleshOutReturnTypes($return_types, $stmt->args, $method_id);
$stmt->inferredType = $return_types;
}
@ -2090,7 +2091,7 @@ class StatementsChecker
$return_types = ClassMethodChecker::getMethodReturnTypes($method_id);
if ($return_types) {
$return_types = self::_fleshOutReturnTypes($return_types, $stmt->args, $method_id);
$return_types = self::fleshOutReturnTypes($return_types, $stmt->args, $method_id);
$stmt->inferredType = $return_types;
}
}
@ -2098,10 +2099,15 @@ class StatementsChecker
return $this->_checkMethodParams($stmt->args, $method_id, $context);
}
protected static function _fleshOutReturnTypes(Type\Union $return_type, array $args, $method_id)
public static function fleshOutReturnTypes(Type\Union $return_type, array $args, $method_id)
{
foreach ($return_type->types as &$return_type_part) {
foreach ($return_type->types as $key => $return_type_part) {
self::_fleshOutAtomicReturnType($return_type_part, $args, $method_id);
if ($return_type_part->value !== $key) {
unset($return_type->types[$key]);
$return_type->types[$return_type_part->value] = $return_type_part;
}
}
return $return_type;
@ -2135,7 +2141,7 @@ class StatementsChecker
if ($return_type instanceof Type\Generic) {
foreach ($return_type->type_params as $type_param) {
if ($type_param instanceof Type\Union) {
$type_param = self::_fleshOutReturnTypes($type_param, $args, $method_id);
$type_param = self::fleshOutReturnTypes($type_param, $args, $method_id);
}
else {
$type_param = self::_fleshOutAtomicReturnType($type_param, $args, $method_id);