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

Support has-at-least type in negation

Browse Source
This commit is contained in:
Brown 2020-01-31 13:13:50 -05:00
parent 37765098e9
commit 34408a892c
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Psalm/Internal/Type/NegatedAssertionReconciler.php
View File

@ -245,7 +245,20 @@ class NegatedAssertionReconciler extends Reconciler
$code_location,
$suppressed_issues,
$failed_reconciliation,
$is_equality
$is_equality,
null
);
}
if (substr($assertion, 0, 13) === 'has-at-least-') {
return self::reconcileNonEmptyCountable(
$existing_var_type,
$key,
$code_location,
$suppressed_issues,
$failed_reconciliation,
$is_equality,
(int) substr($assertion, 13)
);
}
@ -488,7 +501,8 @@ class NegatedAssertionReconciler extends Reconciler
?CodeLocation $code_location,
array $suppressed_issues,
int &$failed_reconciliation,
bool $is_equality
bool $is_equality,
?int $min_count
) : Type\Union {
$old_var_type_string = $existing_var_type->getId();
$existing_var_atomic_types = $existing_var_type->getAtomicTypes();
@ -497,9 +511,10 @@ class NegatedAssertionReconciler extends Reconciler
$array_atomic_type = $existing_var_atomic_types['array'];
$did_remove_type = false;
if ($array_atomic_type instanceof Type\Atomic\TNonEmptyArray
|| $array_atomic_type instanceof Type\Atomic\TNonEmptyList
|| ($array_atomic_type instanceof Type\Atomic\ObjectLike && $array_atomic_type->sealed)
if (($array_atomic_type instanceof Type\Atomic\TNonEmptyArray
|| $array_atomic_type instanceof Type\Atomic\TNonEmptyList)
&& ($min_count === null
|| $array_atomic_type->count >= $min_count)
) {
$did_remove_type = true;

8
tests/TypeReconciliation/ConditionalTest.php
View File

@ -2532,6 +2532,14 @@ class ConditionalTest extends \Psalm\Tests\TestCase
}
}',
],
'noCrashOnCountUndefined' => [
'<?php
/**
* @psalm-suppress UndefinedGlobalVariable
* @psalm-suppress MixedArgument
*/
if(!(count($colonnes) == 37 || count($colonnes) == 40)) {}',
],
];
}