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

Fix view checks

Browse Source
This commit is contained in:
Matthew Brown 2016-08-15 02:12:27 -04:00
parent 899f74b12e
commit faae9062ba
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Psalm/Checker/ClassLikeChecker.php
View File

@ -318,6 +318,8 @@ abstract class ClassLikeChecker implements StatementsSource
return self::$method_checkers[$method_id];
}
ClassMethodChecker::registerClassMethod($method_id);
$declaring_method_id = ClassMethodChecker::getDeclaringMethod($method_id);
$declaring_class = explode('::', $declaring_method_id)[0];
@ -329,10 +331,11 @@ abstract class ClassLikeChecker implements StatementsSource
foreach ($class_checker->class->stmts as $stmt) {
if ($stmt instanceof PhpParser\Node\Stmt\ClassMethod) {
$method_checker = new ClassMethodChecker($stmt, $class_checker);
$method_id = $class_checker->absolute_class . '::' . $stmt->name;
self::$method_checkers[$method_id] = $method_checker;
return $method_checker;
if ($declaring_method_id === $class_checker->absolute_class . '::' . $stmt->name) {
$method_checker = new ClassMethodChecker($stmt, $class_checker);
self::$method_checkers[$method_id] = $method_checker;
return $method_checker;
}
}
}

2
src/Psalm/Checker/ClassMethodChecker.php
View File

@ -259,7 +259,7 @@ class ClassMethodChecker extends FunctionLikeChecker
}
}
protected static function registerClassMethod($method_id)
public static function registerClassMethod($method_id)
{
ClassLikeChecker::registerClass(explode('::', $method_id)[0]);
}

1
src/Psalm/Checker/FunctionLikeChecker.php
View File

@ -57,7 +57,6 @@ abstract class FunctionLikeChecker implements StatementsSource
// if we know that the function has no effects on vars, we don't bother rechecking
if (isset(self::$no_effects_hashes[$hash])) {
list($context->vars_in_scope, $context->vars_possibly_in_scope) = self::$no_effects_hashes[$hash];
return;
}
}