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

Merge pull request #6636 from orklah/possibly-undefined-satisfy-nullable

Browse Source 
Allow sending possibly_undefined inputs to optional params
This commit is contained in:
orklah 2021-10-10 23:12:38 +02:00 committed by GitHub
commit 3aee938910
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Internal/Analyzer/Statements/Expression/Call/ArgumentAnalyzer.php
View File

@ -652,6 +652,7 @@ class ArgumentAnalyzer
/**
* @param Atomic\TKeyedArray|Atomic\TArray|Atomic\TList|Atomic\TClassStringMap $unpacked_atomic_array
* @return null|false
* @psalm-suppress ComplexMethod
*/
public static function verifyType(
StatementsAnalyzer $statements_analyzer,
@ -823,7 +824,8 @@ class ArgumentAnalyzer
$codebase->analyzer->incrementNonMixedCount($statements_analyzer->getFilePath());
}
if ($function_param->by_ref) {
if ($function_param->by_ref || $function_param->is_optional) {
//if the param is optional or a ref, we'll allow the input to be possibly_undefined
$param_type->possibly_undefined = true;
}
@ -1016,12 +1018,13 @@ class ArgumentAnalyzer
true
);
$type = ($input_type->possibly_undefined ? 'possibly undefined ' : '') . $input_type->getId();
if ($union_comparison_results->scalar_type_match_found) {
if ($cased_method_id !== 'echo' && $cased_method_id !== 'print') {
if (IssueBuffer::accepts(
new InvalidScalarArgument(
'Argument ' . ($argument_offset + 1) . $method_identifier . ' expects ' .
$param_type->getId() . ', ' . $input_type->getId() . ' provided',
$param_type->getId() . ', ' . $type . ' provided',
$arg_location,
$cased_method_id
),
@ -1034,7 +1037,7 @@ class ArgumentAnalyzer
if (IssueBuffer::accepts(
new PossiblyInvalidArgument(
'Argument ' . ($argument_offset + 1) . $method_identifier . ' expects ' . $param_type->getId() .
', possibly different type ' . $input_type->getId() . ' provided',
', possibly different type ' . $type . ' provided',
$arg_location,
$cased_method_id
),
@ -1046,7 +1049,7 @@ class ArgumentAnalyzer
if (IssueBuffer::accepts(
new InvalidArgument(
'Argument ' . ($argument_offset + 1) . $method_identifier . ' expects ' . $param_type->getId() .
', ' . $input_type->getId() . ' provided',
', ' . $type . ' provided',
$arg_location,
$cased_method_id
),

18
tests/FunctionCallTest.php
View File

@ -1643,7 +1643,25 @@ class FunctionCallTest extends TestCase
[],
'8.1',
],
'possiblyUndefinedArrayDestructurationOnOptionalArg' => [
'<?php
class A
{
}
function foo(A $a1, A $a2 = null): void
{
}
$arguments = [new A()];
if (mt_rand(1, 10) > 5) {
// when this is done outside if - no errors
$arguments[] = new A();
}
foo(...$arguments);
',
],
];
}