danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-11 16:59:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix #3927 - prevent crash with bad type ref

Browse Source
This commit is contained in:
Matthew Brown 2020-08-16 12:43:46 -04:00
parent a356a43a51
commit ec2178d14a
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Psalm/Internal/PhpVisitor/ReflectorVisitor.php
View File

@ -609,24 +609,39 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
} }
} }
$classlike_storage->type_aliases = \array_map( $converted_aliases = \array_map(
function (TypeAlias\InlineTypeAlias $t) { function (TypeAlias\InlineTypeAlias $t) {
$union = TypeParser::parseTokens( try {
$t->replacement_tokens, $union = TypeParser::parseTokens(
null, $t->replacement_tokens,
[], null,
$this->type_aliases [],
); $this->type_aliases
);
$union->setFromDocblock(); $union->setFromDocblock();
return new TypeAlias\ClassTypeAlias( return new TypeAlias\ClassTypeAlias(
\array_values($union->getAtomicTypes()) \array_values($union->getAtomicTypes())
); );
} catch (\Exception $e) {
return null;
}
}, },
$this->classlike_type_aliases $this->classlike_type_aliases
); );
foreach ($converted_aliases as $key => $type) {
if (!$type) {
$classlike_storage->docblock_issues[] = new InvalidDocblock(
'@psalm-type ' . $key . ' contains invalid references',
new CodeLocation($this->file_scanner, $node, null, true)
);
}
}
$classlike_storage->type_aliases = \array_filter($converted_aliases);
$this->classlike_type_aliases = []; $this->classlike_type_aliases = [];
if ($classlike_storage->has_visitor_issues) { if ($classlike_storage->has_visitor_issues) {

11
tests/TypeAnnotationTest.php
View File

@ -386,6 +386,17 @@ class TypeAnnotationTest extends TestCase
}', }',
'error_message' => 'UndefinedDocblockClass', 'error_message' => 'UndefinedDocblockClass',
], ],
'noCrashWithPriorReference' => [
'<?php
/**
* @psalm-type _C=array{c:_CC}
* @psalm-type _CC=float
*/
class A {
}',
'error_message' => 'InvalidDocblock',
],
]; ];
} }
} }