Improve inference of constant() calls

vimeo · Jan 14, 2020 · adc6589 · adc6589
1 parent b09869b
commit adc6589
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php b/src/Psalm/Internal/Analyzer/Statements/Expression/Call/FunctionCallAnalyzer.php
@@ -925,6 +925,27 @@ function (Assertion $assertion) use ($generic_params) : Assertion {
                 } else {
                     $context->check_consts = false;
                 }
+            } elseif ($function->parts === ['constant']) {
+                if ($first_arg) {
+                    $fq_const_name = StatementsAnalyzer::getConstName(
+                        $first_arg->value,
+                        $statements_analyzer->node_data,
+                        $codebase,
+                        $statements_analyzer->getAliases()
+                    );
+
+                    if ($fq_const_name !== null) {
+                        $const_type = $statements_analyzer->getConstType(
+                            $fq_const_name,
+                            true,
+                            $context
+                        );
+
+                        $statements_analyzer->node_data->setType($stmt, $const_type);
+                    }
+                } else {
+                    $context->check_consts = false;
+                }
             } elseif ($first_arg
                 && $function_id
                 && strpos($function_id, 'is_') === 0

diff --git a/tests/ConstantTest.php b/tests/ConstantTest.php
@@ -477,6 +477,11 @@ function test($value): void {
 
                     test(Test::VALUES);'
             ],
+            'resolveConstantFetchViaFunction' => [
+                '<?php
+                    const FOO = 1;
+                    echo \constant("FOO");'
+            ],
         ];
     }