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 buggy switch statement revealed after switch fixes

Browse Source
This commit is contained in:
Matthew Brown 2017-11-28 22:46:43 -05:00
parent f4212d897c
commit 495252494f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Type/ParseTree.php
View File

@ -97,6 +97,10 @@ class ParseTree
break;
case ',':
if (!$current_leaf->parent) {
throw new TypeParseTreeException('Cannot parse comma in with no parent node');
}
$current_parent = $current_leaf->parent;
$context_node = $current_leaf;
@ -112,18 +116,14 @@ class ParseTree
throw new TypeParseTreeException('Cannot parse comma in non-generic/array type');
}
if (!$current_parent) {
throw new TypeParseTreeException('Cannot parse comma in with no parent node');
}
if ($context_node->value === self::GENERIC && $current_parent->value !== self::GENERIC) {
if (!isset($current_parent->parent) || !$current_parent->parent->value) {
throw new TypeParseTreeException('Cannot parse comma in non-generic/array type');
}
$current_leaf = $current_leaf->parent;
} elseif ($context_node->value === self::OBJECT_LIKE &&
$current_parent->value !== self::OBJECT_LIKE
} elseif ($context_node->value === self::OBJECT_LIKE
&& $current_parent->value !== self::OBJECT_LIKE
) {
do {
$current_leaf = $current_leaf->parent;