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

Prevent crash when @template as type is missing

Browse Source
This commit is contained in:
Brown 2019-01-08 15:11:57 -05:00
parent f3133aac84
commit 73770c085e
2 changed files with 52 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -717,14 +717,24 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
foreach ($docblock_info->templates as $template_type) {
if (count($template_type) === 3) {
$storage->template_types[$template_type[0]] = Type::parseTokens(
Type::fixUpLocalType(
$template_type[2],
$this->aliases,
null,
$this->type_aliases
)
);
if (trim($template_type[2])) {
$storage->template_types[$template_type[0]] = Type::parseTokens(
Type::fixUpLocalType(
$template_type[2],
$this->aliases,
null,
$this->type_aliases
)
);
} else {
if (IssueBuffer::accepts(
new InvalidDocblock(
'Template missing as type',
new CodeLocation($this->file_scanner, $node, null, true)
)
)) {
}
}
} else {
$storage->template_types[$template_type[0]] = Type::getMixed();
}
@ -1337,14 +1347,24 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
foreach ($docblock_info->templates as $template_type) {
if (count($template_type) === 3) {
$storage->template_types[$template_type[0]] = Type::parseTokens(
Type::fixUpLocalType(
$template_type[2],
$this->aliases,
null,
$this->type_aliases
)
);
if (trim($template_type[2])) {
$storage->template_types[$template_type[0]] = Type::parseTokens(
Type::fixUpLocalType(
$template_type[2],
$this->aliases,
null,
$this->type_aliases
)
);
} else {
if (IssueBuffer::accepts(
new InvalidDocblock(
'Template missing as type',
new CodeLocation($this->file_scanner, $stmt, null, true)
)
)) {
}
}
} else {
$storage->template_types[$template_type[0]] = Type::getMixed();
}

16
tests/AnnotationTest.php
View File

@ -1137,6 +1137,22 @@ class AnnotationTest extends TestCase
}',
'error_message' => 'InvalidDocblock',
],
'noCrashOnInvalidClassTemplateAsType' => [
'<?php
/**
* @template T as ' . '
*/
class A {}',
'error_message' => 'InvalidDocblock',
],
'noCrashOnInvalidFunctionTemplateAsType' => [
'<?php
/**
* @template T as ' . '
*/
function foo() : void {}',
'error_message' => 'InvalidDocblock',
],
];
}
}