danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Fix #812 - deal with errant colon without crashing

Browse Source
This commit is contained in:
Matthew Brown 2018-06-12 09:11:13 -04:00
parent 54893fdd55
commit 3891b08fc2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,6 +252,10 @@ class ParseTree
throw new TypeParseTreeException('Unexpected LHS of property');
}
if (!$current_parent instanceof ParseTree\ObjectLikeTree) {
throw new TypeParseTreeException('Saw : outside of object-like array');
}
$new_parent_leaf = new ParseTree\ObjectLikePropertyTree($current_leaf->value, $current_parent);
$new_parent_leaf->possibly_undefined = $last_token === '?';
$current_leaf->parent = $new_parent_leaf;

10
tests/TypeParseTest.php
View File

@ -493,6 +493,16 @@ class TypeParseTest extends TestCase
Type::parseString('|array');
}
/**
* @expectedException \Psalm\Exception\TypeParseTreeException
*
* @return void
*/
public function testBadColonDash()
{
Type::parseString('array|string:-');
}
/**
* @expectedException \Psalm\Exception\TypeParseTreeException
*