danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #1149 - allow empty check on iterable

Browse Source
This commit is contained in:
Matthew Brown 2018-12-26 11:52:37 +01:00
parent 571c1d7413
commit b0534cc498
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Type/Reconciler.php
View File

@ -233,6 +233,7 @@ class Reconciler
&& !$has_equality
&& !$has_count_check
&& !$result_type->hasMixed()
&& !$result_type->hasType('iterable')
&& (!$has_isset || substr($key, -1, 1) !== ']')
) {
$reconcile_key = implode(
@ -400,7 +401,8 @@ class Reconciler
$existing_var_atomic_types = $existing_var_type->getTypes();
if ($new_var_type === 'falsy' || $new_var_type === 'empty') {
$did_remove_type = $existing_var_type->hasDefinitelyNumericType(false);
$did_remove_type = $existing_var_type->hasDefinitelyNumericType(false)
|| $existing_var_type->hasType('iterable');
if ($existing_var_type->hasMixed()) {
if ($existing_var_type->isMixed()
@ -554,6 +556,10 @@ class Reconciler
|| $type instanceof TResource
|| $type instanceof TCallable
) {
if ($type instanceof TNamedObject && $type->value === 'iterable') {
continue;
}
$did_remove_type = true;
$existing_var_type->removeType($type_key);
@ -1273,7 +1279,8 @@ class Reconciler
|| $existing_var_type->isEmpty()
|| $existing_var_type->hasType('bool')
|| $existing_var_type->possibly_undefined
|| $existing_var_type->possibly_undefined_from_try;
|| $existing_var_type->possibly_undefined_from_try
|| $existing_var_type->hasType('iterable');
if ($is_strict_equality && $new_var_type === 'empty') {
$existing_var_type->removeType('null');

7
tests/EmptyTest.php
View File

@ -278,6 +278,13 @@ class EmptyTest extends TestCase
'assertions' => [],
'error_levels' => ['MixedAssignment', 'MissingParamType', 'MixedArgument', 'MixedArrayOffset'],
],
'possiblyEmptyIterable' => [
'<?php
function foo(iterable $i) : void {
if (empty($i)) {}
if (!empty($i)) {}
}',
],
];
}