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

Pass through typa aliases where appropriate

Browse Source
This commit is contained in:
Brown 2020-05-14 00:48:58 -04:00
parent 006c6e09f1
commit 48504aa88c
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1137,7 +1137,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$storage->template_types
$storage->template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -1189,7 +1190,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$yield_type = TypeParser::parseTokens(
$yield_type_tokens,
null,
$storage->template_types ?: []
$storage->template_types ?: [],
$this->type_aliases
);
$yield_type->setFromDocblock();
$yield_type->queueClassLikesForScanning(
@ -1291,7 +1293,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$fq_classlike_name
),
null,
$this->class_template_types
$this->class_template_types,
$this->type_aliases
);
$mixin_type->queueClassLikesForScanning(
@ -1360,7 +1363,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$this->class_template_types
$this->class_template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -1446,7 +1450,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$this->class_template_types
$this->class_template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -1534,7 +1539,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$this->class_template_types
$this->class_template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -2219,7 +2225,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$storage->template_types + ($template_types ?: [])
$storage->template_types + ($template_types ?: []),
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -2409,7 +2416,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$this->type_aliases
),
null,
$this->function_template_types + $class_template_types
$this->function_template_types + $class_template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(
@ -2608,7 +2616,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$storage->return_type = TypeParser::parseTokens(
\array_values($fixed_type_tokens),
null,
$this->function_template_types + $class_template_types
$this->function_template_types + $class_template_types,
$this->type_aliases
);
$storage->return_type->setFromDocblock();
@ -3034,7 +3043,8 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
$fq_classlike_name
),
null,
$this->function_template_types + $class_template_types
$this->function_template_types + $class_template_types,
$this->type_aliases
);
} catch (TypeParseTreeException $e) {
$storage->docblock_issues[] = new InvalidDocblock(