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

Cleanup extra issues from recent fixes

Browse Source
This commit is contained in:
Brown 2019-08-27 14:16:34 -04:00
parent 1cb8c3f6c4
commit 4db8ca6a1d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Psalm/Internal/Analyzer/Statements/Expression/CallAnalyzer.php
View File

@ -777,6 +777,8 @@ class CallAnalyzer
) {
$array_arg = $args[0]->value;
$context->inside_call = true;
if (ExpressionAnalyzer::analyze(
$statements_analyzer,
$array_arg,
@ -795,7 +797,6 @@ class CallAnalyzer
}
}
$context->inside_call = true;
if (isset($array_arg->inferredType) && $array_arg->inferredType->hasArray()) {
/** @var TArray|ObjectLike */
$array_type = $array_arg->inferredType->getTypes()['array'];

5
src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ArrayFetchAnalyzer.php
View File

@ -452,6 +452,11 @@ class ArrayFetchAnalyzer
// ok, type becomes an ObjectLike
$array_type->removeType($type_string);
$type = new ObjectLike([$key_value => $from_mixed_array ? Type::getMixed() : Type::getEmpty()]);
if ($from_mixed_array) {
$type->had_mixed_value = true;
}
$array_type->addType($type);
}