danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-13 09:47:29 +01:00
Code Issues Projects Releases Wiki Activity

Create ObjectLike entities

Browse Source
This commit is contained in:
Matthew Brown 2016-09-22 00:49:48 -04:00
parent 5113ffefee
commit 2e371aca00
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Psalm/Checker/StatementsChecker.php
View File

@ -1659,6 +1659,8 @@ class StatementsChecker
$item_key_type = null; $item_key_type = null;
$item_value_type = null; $item_value_type = null;
$property_types = [];
foreach ($stmt->items as $item) { foreach ($stmt->items as $item) {
if ($item->key) { if ($item->key) {
if ($this->checkExpression($item->key, $context) === false) { if ($this->checkExpression($item->key, $context) === false) {
@ -1683,6 +1685,10 @@ class StatementsChecker
} }
if (isset($item->value->inferredType)) { if (isset($item->value->inferredType)) {
if ($item->key instanceof PhpParser\Node\Scalar\String_) {
$property_types[$item->key->value] = $item->value->inferredType;
}
if ($item_value_type) { if ($item_value_type) {
$item_value_type = Type::combineUnionTypes($item->value->inferredType, $item_value_type); $item_value_type = Type::combineUnionTypes($item->value->inferredType, $item_value_type);
} }
@ -1694,7 +1700,7 @@ class StatementsChecker
// if this array looks like an object-like array, let's return that instead // if this array looks like an object-like array, let's return that instead
if ($item_value_type && !$item_value_type->isSingle() && $item_key_type && $item_key_type->hasString() && !$item_key_type->hasInt()) { if ($item_value_type && !$item_value_type->isSingle() && $item_key_type && $item_key_type->hasString() && !$item_key_type->hasInt()) {
$stmt->inferredType = new Type\Union([new Type\Atomic('object-like')]); $stmt->inferredType = new Type\Union([new Type\ObjectLike('object-like', $property_types)]);
return; return;
} }