danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Remove need for typehint

Browse Source
This commit is contained in:
Matthew Brown 2016-11-21 00:03:46 -05:00
parent e43fd6af53
commit 8acc0f388b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Checker/TypeChecker.php
View File

@ -1337,7 +1337,6 @@ class TypeChecker
$new_base_key = $base_key . '->' . $key_parts[$i];
if (!isset($existing_keys[$new_base_key])) {
/** @var Type\Union|null */
$new_base_type = null;
foreach ($existing_keys[$base_key]->types as $existing_key_type_part) {
@ -1358,10 +1357,10 @@ class TypeChecker
$class_property_type = $class_property_type ? clone $class_property_type : Type::getMixed();
}
if (!$new_base_type) {
$new_base_type = $class_property_type;
} else {
if ($new_base_type instanceof Type\Union) {
$new_base_type = Type::combineUnionTypes($new_base_type, $class_property_type);
} else {
$new_base_type = $class_property_type;
}
$existing_keys[$new_base_key] = $new_base_type;