danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-03 10:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Deal with optional callmap args better

Browse Source
This commit is contained in:
Matthew Brown 2016-10-26 11:51:59 -04:00
parent 76191e2505
commit c48ce9ec33
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,17 +248,23 @@ class FunctionChecker extends FunctionLikeChecker
foreach ($call_map_function_args as $arg_name => $arg_type) {
$by_reference = false;
$optional = false;
if ($arg_name[0] === '&') {
$arg_name = substr($arg_name, 1);
$by_reference = true;
}
if (substr($arg_name, -1) === '=') {
$arg_name = substr($arg_name, 0, -1);
$optional = true;
}
$function_types[] = new FunctionLikeParameter(
$arg_name,
$by_reference,
$arg_type ? Type::parseString($arg_type) : Type::getMixed(),
true // @todo - need to have non-optional parameters
$optional
);
}

15
src/Psalm/Checker/FunctionLikeChecker.php
View File

@ -827,8 +827,21 @@ abstract class FunctionLikeChecker implements StatementsSource
$last_param = count($possible_function_params) ? $possible_function_params[count($possible_function_params) - 1] : null;
$mandatory_param_count = count($possible_function_params);
foreach ($possible_function_params as $i => $possible_function_param) {
if ($possible_function_param->is_optional) {
$mandatory_param_count = $i;
break;
}
}
if ($mandatory_param_count > count($args)) {
continue;
}
foreach ($args as $argument_offset => $arg) {
if (count($possible_function_params) <= $argument_offset && (!$last_param || $last_param->name !== '...')) {
if (count($possible_function_params) <= $argument_offset && (!$last_param || substr($last_param->name, 0, 3) !== '...')) {
$all_args_match = false;
break;
}