danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

run format checks for splat too

Browse Source
This commit is contained in:
kkmuffme 2023-06-21 17:18:03 +02:00
parent 9599c240b3
commit 28b9e8dd95
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Psalm/Internal/Provider/ReturnTypeProvider/SprintfReturnTypeProvider.php
View File

@ -62,8 +62,9 @@ class SprintfReturnTypeProvider implements FunctionReturnTypeProviderInterface
return null;
}
$has_splat_args = false;
$node_type_provider = $statements_source->getNodeTypeProvider();
foreach ($call_args as $index => $call_arg) {
foreach ($call_args as $call_arg) {
$type = $node_type_provider->getType($call_arg->value);
if ($type === null) {
continue;
@ -72,7 +73,8 @@ class SprintfReturnTypeProvider implements FunctionReturnTypeProviderInterface
// if it's an array, used with splat operator
// we cannot validate it reliably below and report false positive errors
if ($type->isArray()) {
return null;
$has_splat_args = true;
break;
}
}
@ -137,7 +139,8 @@ class SprintfReturnTypeProvider implements FunctionReturnTypeProviderInterface
return Type::getString();
}
$provided_placeholders_count = count($call_args) - 1;
// assume a random, high number for tests
$provided_placeholders_count = $has_splat_args === true ? 100 : count($call_args) - 1;
$dummy = array_fill(0, $provided_placeholders_count, '');
// check if we have enough/too many arguments and a valid format
@ -229,6 +232,11 @@ class SprintfReturnTypeProvider implements FunctionReturnTypeProviderInterface
return Type::getFalse();
}
// we can only validate the format and arg 1 when using splat
if ($has_splat_args === true) {
break;
}
if (is_string($result) && count($dummy) + 1 <= $provided_placeholders_count) {
IssueBuffer::maybeAdd(
new TooManyArguments(

12
tests/ReturnTypeProvider/SprintfTest.php
View File

@ -186,12 +186,22 @@ class SprintfTest extends TestCase
yield 'sprintfSplatUnpackingArray' => [
'code' => '<?php
$a = ["a", "b", "c"];
$val = sprintf("%s %s %s", ...$a);
$val = sprintf("%s%s%s", ...$a);
',
'assertions' => [
'$val===' => 'string',
],
];
yield 'sprintfSplatUnpackingArrayNonEmpty' => [
'code' => '<?php
$a = ["a", "b", "c"];
$val = sprintf("%s %s %s", ...$a);
',
'assertions' => [
'$val===' => 'non-empty-string',
],
];
}
public function providerInvalidCodeParse(): iterable