danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-12-02 09:37:59 +01:00
Code Issues Projects Releases Wiki Activity

Put back function hoisting

Browse Source
This commit is contained in:
Matthew Brown 2016-08-15 00:58:30 -04:00
parent cd36893b9f
commit ccad9978f5
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Psalm/Checker/StatementsChecker.php
View File

@ -120,6 +120,14 @@ class StatementsChecker
$function_checkers = []; $function_checkers = [];
// hoist functions to the top
foreach ($stmts as $stmt) {
if ($stmt instanceof PhpParser\Node\Stmt\Function_) {
$function_checker = new FunctionChecker($stmt, $this->source, $context->file_name);
$function_checkers[$stmt->name] = $function_checker;
}
}
foreach ($stmts as $stmt) { foreach ($stmts as $stmt) {
foreach (Config::getInstance()->getPlugins() as $plugin) { foreach (Config::getInstance()->getPlugins() as $plugin) {
if ($plugin->checkStatement($stmt, $context, $this->file_name) === false) { if ($plugin->checkStatement($stmt, $context, $this->file_name) === false) {
@ -186,8 +194,8 @@ class StatementsChecker
} }
} elseif ($stmt instanceof PhpParser\Node\Stmt\Function_) { } elseif ($stmt instanceof PhpParser\Node\Stmt\Function_) {
$function_checker = new FunctionChecker($stmt, $this->source, $context->file_name); $function_context = new Context($this->file_name, $context->self);
$function_checker->check(new Context($this->file_name, $context->self)); $function_checkers[$stmt->name]->check($function_context);
} elseif ($stmt instanceof PhpParser\Node\Expr) { } elseif ($stmt instanceof PhpParser\Node\Expr) {
$this->checkExpression($stmt, $context); $this->checkExpression($stmt, $context);