danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 04:45:20 +01:00
Code Issues Projects Releases Wiki Activity

Unset should change array with keyed offsets

Browse Source
This commit is contained in:
Matt Brown 2021-01-13 18:10:59 -05:00
parent d10a06837d
commit ef4afd72bc
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/Statements/UnsetAnalyzer.php
View File

@ -81,8 +81,10 @@ class UnsetAnalyzer
$atomic_root_type->sealed = false;
$root_type->addType(
$atomic_root_type->getGenericArrayType()
$atomic_root_type->getGenericArrayType(false)
);
$atomic_root_type->is_list = false;
}
} elseif ($atomic_root_type instanceof Type\Atomic\TNonEmptyArray) {
$root_type->addType(

4
src/Psalm/Type/Atomic/TKeyedArray.php
View File

@ -246,7 +246,7 @@ class TKeyedArray extends \Psalm\Type\Atomic
return $value_type;
}
public function getGenericArrayType(): TArray
public function getGenericArrayType(bool $allow_non_empty = true): TArray
{
$key_types = [];
$value_type = null;
@ -285,7 +285,7 @@ class TKeyedArray extends \Psalm\Type\Atomic
$value_type->possibly_undefined = false;
if ($this->previous_value_type || $has_defined_keys) {
if ($allow_non_empty && ($this->previous_value_type || $has_defined_keys)) {
$array_type = new TNonEmptyArray([$key_type, $value_type]);
} else {
$array_type = new TArray([$key_type, $value_type]);

8
tests/TypeReconciliation/RedundantConditionTest.php
View File

@ -797,6 +797,14 @@ class RedundantConditionTest extends \Psalm\Tests\TestCase
return (int) (hexdec($x) + 1);
}',
],
'unsetArrayWithKnownOffset' => [
'<?php
function bar(string $f) : void {
$filter = rand(0, 1) ? explode(",", $f) : [$f];
unset($filter[rand(0, 1)]);
if ($filter) {}
}'
],
];
}