danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-30 04:39:00 +01:00
Code Issues Projects Releases Wiki Activity

Also catch static invocations of non-static methods

Browse Source
This commit is contained in:
Matthew Brown 2016-02-05 10:20:06 -05:00
parent 9a35742803
commit 0e600665bb
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/StatementsChecker.php
View File

@ -860,6 +860,7 @@ class StatementsChecker
} else { } else {
$absolute_class = ($this->_namespace ? '\\' : '') . $this->_namespace . '\\' . $this->_class_name; $absolute_class = ($this->_namespace ? '\\' : '') . $this->_namespace . '\\' . $this->_class_name;
} }
} elseif ($this->_check_classes) { } elseif ($this->_check_classes) {
ClassChecker::checkClassName($stmt->class, $this->_namespace, $this->_aliased_classes, $this->_file_name); ClassChecker::checkClassName($stmt->class, $this->_namespace, $this->_aliased_classes, $this->_file_name);
$absolute_class = ClassChecker::getAbsoluteClassFromName($stmt->class, $this->_namespace, $this->_aliased_classes); $absolute_class = ClassChecker::getAbsoluteClassFromName($stmt->class, $this->_namespace, $this->_aliased_classes);
@ -881,6 +882,17 @@ class StatementsChecker
throw new CodeException('Method ' . $method_id . ' is not static', $this->_file_name, $stmt->getLine()); throw new CodeException('Method ' . $method_id . ' is not static', $this->_file_name, $stmt->getLine());
} }
} }
else {
if ($stmt->class->parts[0] === 'self' && $stmt->name !== '__construct') {
if (!isset(self::$_static_methods[$method_id])) {
self::_extractReflectionMethodInfo($method_id);
}
if (!self::$_static_methods[$method_id]) {
throw new CodeException('Cannot call non-static method ' . $method_id . ' as if it were static', $this->_file_name, $stmt->getLine());
}
}
}
$return_types = $this->_getMethodReturnTypes($method_id); $return_types = $this->_getMethodReturnTypes($method_id);