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

Fix #4917 - allow array_reduce to be called with a single arg

Browse Source
This commit is contained in:
Matt Brown 2021-01-06 12:59:51 -05:00
parent 665170eadb
commit 7ffea7c425
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Psalm/Internal/Provider/ReturnTypeProvider/ArrayReduceReturnTypeProvider.php
View File

@ -101,10 +101,10 @@ class ArrayReduceReturnTypeProvider implements \Psalm\Plugin\EventHandler\Functi
$reduce_return_type = Type::combineUnionTypes($closure_return_type, $reduce_return_type);
if ($closure_atomic_type->params !== null) {
if (count($closure_atomic_type->params) < 2) {
if (count($closure_atomic_type->params) < 1) {
if (IssueBuffer::accepts(
new InvalidArgument(
'The closure passed to array_reduce needs two params',
'The closure passed to array_reduce at least one parameter',
new CodeLocation($statements_source, $function_call_arg)
),
$statements_source->getSuppressedIssues()
@ -115,7 +115,8 @@ class ArrayReduceReturnTypeProvider implements \Psalm\Plugin\EventHandler\Functi
return Type::getMixed();
}
[$carry_param, $item_param] = $closure_atomic_type->params;
$carry_param = $closure_atomic_type->params[0];
$item_param = $closure_atomic_type->params[1] ?? null;
if ($carry_param->type
&& (
@ -149,7 +150,8 @@ class ArrayReduceReturnTypeProvider implements \Psalm\Plugin\EventHandler\Functi
return Type::getMixed();
}
if ($item_param->type
if ($item_param
&& $item_param->type
&& $array_arg_atomic_type
&& !$array_arg_atomic_type->type_params[1]->hasMixed()
&& !UnionTypeComparator::isContainedBy(

2
tests/ArrayFunctionCallTest.php
View File

@ -1962,7 +1962,7 @@ class ArrayFunctionCallTest extends TestCase
$direct_closure_result = array_reduce(
$arr,
function (int $carry) : int {
function() : int {
return 5;
},
1