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

Also check for non-scalar types in reconciliation

Browse Source
This commit is contained in:
Matthew Brown 2017-11-21 21:00:06 -05:00
parent b1a35d6a6e
commit 0c917f632d
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -229,17 +229,31 @@ class TypeChecker
return Type::getMixed();
}
if ($new_var_type === '!numeric') {
$numeric_types = [];
if ($new_var_type === '!scalar') {
$non_scalar_types = [];
foreach ($existing_var_type->types as $type) {
if (!$type->isNumericType()) {
$numeric_types[] = $type;
if (!($type instanceof Scalar)) {
$non_scalar_types[] = $type;
}
}
if ($numeric_types) {
return new Type\Union($numeric_types);
if ($non_scalar_types) {
return new Type\Union($non_scalar_types);
}
}
if ($new_var_type === '!numeric') {
$non_numeric_types = [];
foreach ($existing_var_type->types as $type) {
if (!$type->isNumericType()) {
$non_numeric_types[] = $type;
}
}
if ($non_numeric_types) {
return new Type\Union($non_numeric_types);
}
}