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

Fix issues with @psalm-ignore-nullable-return types

Browse Source
This commit is contained in:
muglug 2017-05-22 14:50:03 -04:00
parent 65d86d35ad
commit 77a44051c5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Checker/FunctionChecker.php
View File

@ -161,6 +161,7 @@ class FunctionChecker extends FunctionLikeChecker
*/ */
public static function replaceTemplateTypes(Type\Union $return_type, array $template_types) public static function replaceTemplateTypes(Type\Union $return_type, array $template_types)
{ {
$ignore_nullable_issues = $return_type->ignore_nullable_issues;
$type_tokens = Type::tokenize((string)$return_type); $type_tokens = Type::tokenize((string)$return_type);
foreach ($type_tokens as &$type_token) { foreach ($type_tokens as &$type_token) {
@ -169,7 +170,11 @@ class FunctionChecker extends FunctionLikeChecker
} }
} }
return Type::parseString(implode('', $type_tokens)); $result_type = Type::parseString(implode('', $type_tokens));
$result_type->ignore_nullable_issues = $ignore_nullable_issues;
return $result_type;
} }
/** /**

3
src/Psalm/Checker/Statements/Expression/AssignmentChecker.php
View File

@ -737,7 +737,8 @@ class AssignmentChecker
if (!TypeChecker::isContainedBy( if (!TypeChecker::isContainedBy(
$assignment_value_type, $assignment_value_type,
$class_property_type, $class_property_type,
$file_checker $file_checker,
$assignment_value_type->ignore_nullable_issues
)) { )) {
if (IssueBuffer::accepts( if (IssueBuffer::accepts(
new InvalidPropertyAssignment( new InvalidPropertyAssignment(

4
src/Psalm/Type/Union.php
View File

@ -280,6 +280,10 @@ class Union
return; return;
} }
if ($new_type && $new_type->ignore_nullable_issues) {
$this->ignore_nullable_issues = true;
}
foreach ($old_type->types as $old_type_part) { foreach ($old_type->types as $old_type_part) {
$this->removeType($old_type_part->getKey()); $this->removeType($old_type_part->getKey());
} }