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

Fix #2593 - don’t crash with bad @param-out annotation

Browse Source
This commit is contained in:
Matthew Brown 2020-01-11 10:47:31 -05:00
parent 1b7b71f2ca
commit 2ae85f7c8b
2 changed files with 39 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/Psalm/Internal/Visitor/ReflectorVisitor.php
View File

@ -2371,25 +2371,39 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
foreach ($docblock_info->params_out as $docblock_param_out) { foreach ($docblock_info->params_out as $docblock_param_out) {
$param_name = substr($docblock_param_out['name'], 1); $param_name = substr($docblock_param_out['name'], 1);
try {
$out_type = Type::parseTokens(
Type::fixUpLocalType(
$docblock_param_out['type'],
$this->aliases,
$this->function_template_types + $class_template_types,
$this->type_aliases
),
null,
$this->function_template_types + $class_template_types
);
} catch (TypeParseTreeException $e) {
if (IssueBuffer::accepts(
new InvalidDocblock(
$e->getMessage() . ' in docblock for ' . $cased_function_id,
new CodeLocation($this->file_scanner, $stmt, null, true)
)
)) {
}
$storage->has_docblock_issues = true;
continue;
}
$out_type->queueClassLikesForScanning(
$this->codebase,
$this->file_storage,
$storage->template_types ?: []
);
foreach ($storage->params as $i => $param_storage) { foreach ($storage->params as $i => $param_storage) {
if ($param_storage->name === $param_name) { if ($param_storage->name === $param_name) {
$out_type = Type::parseTokens(
Type::fixUpLocalType(
$docblock_param_out['type'],
$this->aliases,
$this->function_template_types + $class_template_types,
$this->type_aliases
),
null,
$this->function_template_types + $class_template_types
);
$out_type->queueClassLikesForScanning(
$this->codebase,
$this->file_storage,
$storage->template_types ?: []
);
$storage->param_out_types[$i] = $out_type; $storage->param_out_types[$i] = $out_type;
} }
} }

8
tests/ReferenceConstraintTest.php
View File

@ -224,6 +224,14 @@ class ReferenceConstraintTest extends TestCase
$v = 8;', $v = 8;',
'error_message' => 'ConflictingReferenceConstraint', 'error_message' => 'ConflictingReferenceConstraint',
], ],
'invalidDocblockForBadAnnotation' => [
'<?php
/**
* @param-out array<a(),bool> $ar
*/
function foo(array &$ar) : void {}',
'error_message' => 'InvalidDocblock',
],
]; ];
} }
} }