danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2644 - improve type inference of autoloaded constants

Browse Source
This commit is contained in:
Matthew Brown 2020-01-17 09:52:43 -05:00
parent 24e1d5446c
commit 471d7610f0
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Psalm/Internal/Analyzer/Statements/Expression/Fetch/ConstFetchAnalyzer.php
View File

@ -101,6 +101,24 @@ class ConstFetchAnalyzer
return Type::getResource(); return Type::getResource();
} }
if ($fq_const_name) {
$stubbed_const_type = $codebase->getStubbedConstantType(
$fq_const_name
);
if ($stubbed_const_type) {
return $stubbed_const_type;
}
}
$stubbed_const_type = $codebase->getStubbedConstantType(
$const_name
);
if ($stubbed_const_type) {
return $stubbed_const_type;
}
$predefined_constants = $codebase->config->getPredefinedConstants(); $predefined_constants = $codebase->config->getPredefinedConstants();
if (($fq_const_name && array_key_exists($fq_const_name, $predefined_constants)) if (($fq_const_name && array_key_exists($fq_const_name, $predefined_constants))
@ -156,14 +174,6 @@ class ConstFetchAnalyzer
return ClassLikeAnalyzer::getTypeFromValue($predefined_constants[$const_name]); return ClassLikeAnalyzer::getTypeFromValue($predefined_constants[$const_name]);
} }
$stubbed_const_type = $codebase->getStubbedConstantType(
$fq_const_name ?: $const_name
);
if ($stubbed_const_type) {
return $stubbed_const_type;
}
return null; return null;
} }
} }