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

Fix #3010 - prevent false-negative after calling isset on possibly-false array

Browse Source
This commit is contained in:
Brown 2020-03-24 12:01:39 -04:00
parent 010b805397
commit 25bd2ed5fb
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -514,7 +514,9 @@ class Reconciler
$new_base_type_candidate->possibly_undefined = true;
}
} elseif ($existing_key_type_part instanceof Type\Atomic\TNull) {
} elseif ($existing_key_type_part instanceof Type\Atomic\TNull
|| $existing_key_type_part instanceof Type\Atomic\TFalse
) {
$new_base_type_candidate = Type::getNull();
} elseif ($existing_key_type_part instanceof Type\Atomic\TClassStringMap) {
return Type::getMixed();
@ -552,9 +554,9 @@ class Reconciler
$codebase
);
}
$existing_keys[$new_base_key] = $new_base_type;
}
$existing_keys[$new_base_key] = $new_base_type;
}
$base_key = $new_base_key;

17
tests/TypeReconciliation/IssetTest.php
View File

@ -980,6 +980,23 @@ class IssetTest extends \Psalm\Tests\TestCase
}',
'error_message' => 'PossiblyUndefinedArrayOffset',
],
'accessAfterIssetCheckOnFalsableArray' => [
'<?php
/**
* @return array{b?: string}|false
*/
function returnPossiblyFalseArray() {
return rand(0, 1) ? false : (rand(0, 1) ? ["b" => "hello"] : []);
}
function foo() : void {
$arr = returnPossiblyFalseArray();
/** @psalm-suppress PossiblyInvalidArrayAccess */
if (!isset($arr["b"])) {}
echo $arr["b"];
}',
'error_message' => 'PossiblyInvalidArrayAccess',
],
];
}
}