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

Add support for static in return types

Browse Source
This commit is contained in:
Matthew Brown 2016-08-10 13:52:16 -04:00
parent 2164d2c9a8
commit cf90f5af4a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/ClassMethodChecker.php
View File

@ -110,7 +110,7 @@ class ClassMethodChecker extends FunctionChecker
return;
}
if (!self::hasIdenticalTypes($declared_return_type, $inferred_return_type)) {
if (!self::hasIdenticalTypes($declared_return_type, $inferred_return_type, $this->_absolute_class)) {
if (IssueBuffer::accepts(
new InvalidReturnType(
'The given return type \'' . $declared_return_type . '\' for ' . $method_id . ' is incorrect, got \'' . $inferred_return_type . '\'',
@ -128,12 +128,14 @@ class ClassMethodChecker extends FunctionChecker
}
}
protected static function hasIdenticalTypes(Type\Union $declared_type, Type\Union $inferred_type)
protected static function hasIdenticalTypes(Type\Union $declared_type, Type\Union $inferred_type, $absolute_class)
{
if ($declared_type->isNullable() !== $inferred_type->isNullable()) {
return false;
}
$inferred_type = StatementsChecker::fleshOutTypes($inferred_type, [], $absolute_class, '');
$simple_declared_types = array_filter(array_keys($declared_type->types), function($type_value) { return $type_value !== 'null'; });
$simple_inferred_types = array_filter(array_keys($inferred_type->types), function($type_value) { return $type_value !== 'null'; });
@ -187,7 +189,7 @@ class ClassMethodChecker extends FunctionChecker
continue;
}
if (!self::hasIdenticalTypes($declared_atomic_type->type_params[0], $inferred_atomic_type->type_params[0])) {
if (!self::hasIdenticalTypes($declared_atomic_type->type_params[0], $inferred_atomic_type->type_params[0], $absolute_class)) {
return false;
}
}