danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Improve yield type substitution

Browse Source
This commit is contained in:
Matthew Brown 2020-05-20 09:12:24 -04:00
parent 2d02064962
commit 3effdc5b69
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Psalm/Internal/Analyzer/Statements/Expression/YieldAnalyzer.php
View File

@ -139,28 +139,42 @@ class YieldAnalyzer
$expression_type = Type::getEmpty();
}
$yield_type = null;
foreach ($expression_type->getAtomicTypes() as $expression_atomic_type) {
if ($expression_atomic_type instanceof Type\Atomic\TNamedObject) {
$classlike_storage = $codebase->classlike_storage_provider->get($expression_atomic_type->value);
if ($classlike_storage->yield) {
if ($expression_atomic_type instanceof Type\Atomic\TGenericObject) {
$yield_type = PropertyFetchAnalyzer::localizePropertyType(
$yield_candidate_type = PropertyFetchAnalyzer::localizePropertyType(
$codebase,
clone $classlike_storage->yield,
$expression_atomic_type,
$classlike_storage,
$classlike_storage
);
if ($yield_type) {
$yield_type = Type::combineUnionTypes(
$yield_type,
$yield_candidate_type,
$codebase
);
} else {
$yield_type = $yield_candidate_type;
}
} else {
$yield_type = Type::getMixed();
}
$expression_type->substitute($expression_type, $yield_type);
}
}
}
if ($yield_type) {
$expression_type->substitute($expression_type, $yield_type);
}
$statements_analyzer->node_data->setType($stmt, $expression_type);
$source = $statements_analyzer->getSource();