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 errors

Browse Source
This commit is contained in:
bugreportuser 2019-02-18 12:51:27 -06:00 committed by Matthew Brown
parent cd23a19931
commit 14ee221075
3 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
View File

@ -607,6 +607,7 @@ class FunctionCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expressio
return false;
}
} elseif ($function->parts === ['define']) {
if ($first_arg) {
$const_name = StatementsAnalyzer::getConstName($first_arg->value);
if ($const_name !== null) {
@ -615,9 +616,12 @@ class FunctionCallAnalyzer extends \Psalm\Internal\Analyzer\Statements\Expressio
$statements_analyzer->setConstType(
$const_name,
isset($second_arg->value->inferredType) ? $second_arg->value->inferredType : Type::getMixed(),
isset($second_arg->value->inferredType) ?
$second_arg->value->inferredType :
Type::getMixed(),
$context
);
}
} else {
$context->check_consts = false;
}

2
src/Psalm/Internal/Analyzer/StatementsAnalyzer.php
View File

@ -1467,7 +1467,7 @@ class StatementsAnalyzer extends SourceAnalyzer implements StatementsSource
}
/**
* @param mixed $first_arg_value
* @param PhpParser\Node\Expr $first_arg_value
*
* @return null|string
*/

4
src/Psalm/Internal/Visitor/ReflectorVisitor.php
View File

@ -588,8 +588,9 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
if ($function_id === 'define') {
$first_arg_value = isset($node->args[0]) ? $node->args[0]->value : null;
$second_arg_value = isset($node->args[1]) ? $node->args[1]->value : null;
if ($first_arg_value && $second_arg_value) {
$const_name = StatementsAnalyzer::getConstName($first_arg_value);
if ($const_name !== null && $second_arg_value) {
if ($const_name !== null) {
$const_type = StatementsAnalyzer::getSimpleType(
$this->codebase,
$second_arg_value,
@ -605,6 +606,7 @@ class ReflectorVisitor extends PhpParser\NodeVisitorAbstract implements PhpParse
}
}
}
}
$mapping_function_ids = [];