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 to support PHP Parser 4.0.2

Browse Source
This commit is contained in:
Matthew Brown 2018-06-03 10:05:50 -04:00
parent 8107587929
commit b47d732993
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -770,6 +770,7 @@ class FunctionChecker extends FunctionLikeChecker
$stmt = $function_call_arg->value->stmts[0];
if ($first_param->variadic === false
&& $first_param->var instanceof PhpParser\Node\Expr\Variable
&& is_string($first_param->var->name)
&& $stmt instanceof PhpParser\Node\Stmt\Return_
&& $stmt->expr

25
src/Psalm/Visitor/DependencyFinderVisitor.php
View File

@ -772,6 +772,21 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
/** @var PhpParser\Node\Param $param */
foreach ($stmt->getParams() as $param) {
if ($param->var instanceof PhpParser\Node\Expr\Error) {
if (IssueBuffer::accepts(
new InvalidDocblock(
'Param' . ((int) $i + 1) . ' of ' . $cased_function_id . ' has invalid syntax',
new CodeLocation($this->file_scanner, $param, null, true)
)
)) {
$storage->has_visitor_issues = true;
++$i;
continue;
}
}
$param_array = $this->getTranslatedFunctionParam($param);
if (isset($existing_params['$' . $param_array->name])) {
@ -783,6 +798,8 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
)) {
$storage->has_visitor_issues = true;
++$i;
continue;
}
}
@ -794,7 +811,11 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
if (!$param_array->is_optional) {
$required_param_count = $i + 1;
if (!$param->variadic && $has_optional_param && is_string($param->var->name)) {
if (!$param->variadic
&& $has_optional_param
&& $param->var instanceof PhpParser\Node\Expr\Variable
&& is_string($param->var->name)
) {
if (IssueBuffer::accepts(
new MisplacedRequiredParam(
'Required param $' . $param->var->name . ' should come before any optional params in ' .
@ -1271,7 +1292,7 @@ class DependencyFinderVisitor extends PhpParser\NodeVisitorAbstract implements P
$is_optional = $param->default !== null;
if (!is_string($param->var->name)) {
if ($param->var instanceof PhpParser\Node\Expr\Error || !is_string($param->var->name)) {
throw new \UnexpectedValueException('Not expecting param name to be non-string');
}