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

Fix #2431 - allow null in template defaults

Browse Source
This commit is contained in:
Matthew Brown 2019-12-13 21:40:09 -05:00
parent e1af0e01ee
commit f40b6625eb
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/FunctionLikeAnalyzer.php
View File

@ -1041,9 +1041,9 @@ abstract class FunctionLikeAnalyzer extends SourceAnalyzer
) {
if (IssueBuffer::accepts(
new InvalidParamDefault(
'Default value type ' . $default_type . ' for argument ' . ($offset + 1)
'Default value type ' . $default_type->getId() . ' for argument ' . ($offset + 1)
. ' of method ' . $cased_method_id
. ' does not match the given type ' . $param_type,
. ' does not match the given type ' . $param_type->getId(),
$function_param->type_location
)
)) {

2
src/Psalm/Internal/Analyzer/TypeAnalyzer.php
View File

@ -733,7 +733,7 @@ class TypeAnalyzer
}
if ($container_type_part instanceof TTemplateParam
&& $container_type_part->as->isNullable()
&& ($container_type_part->as->isNullable() || $container_type_part->as->isMixed())
) {
return true;
}

5
src/Psalm/Internal/Visitor/ReflectorVisitor.php
View File

@ -2953,7 +2953,10 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$existing_param_type_nullable = $storage_param->is_nullable;
if (!$storage_param->type || $storage_param->type->hasMixed() || $storage->template_types) {
if ($existing_param_type_nullable && !$new_param_type->isNullable()) {
if ($existing_param_type_nullable
&& !$new_param_type->isNullable()
&& !$new_param_type->hasTemplate()
) {
$new_param_type->addType(new Type\Atomic\TNull());
}

22
tests/Template/FunctionTemplateTest.php
View File

@ -856,6 +856,28 @@ class FunctionTemplateTest extends TestCase
}
}'
],
'falseDefault' => [
'<?php
/**
* @template T
* @param T $v
* @return T
*/
function exampleWithNullDefault($v = false) {
return $v;
}'
],
'nullDefault' => [
'<?php
/**
* @template T
* @param T $v
* @return T
*/
function exampleWithNullDefault($v = null) {
return $v;
}'
],
];
}