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

Remove check_nulls protection

Browse Source
This commit is contained in:
Matthew Brown 2016-06-05 20:28:02 -04:00
parent d8854fd4ef
commit 7bcaa08db8
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/CodeInspector/StatementsChecker.php
View File

@ -74,7 +74,6 @@ class StatementsChecker
$this->_class_extends = $this->_source->getParentClass();
$this->_check_variables = FileChecker::shouldCheckVariables($this->_file_name) || $enforce_variable_checks;
$this->_check_nulls = FileChecker::shouldCheckNulls($this->_file_name);
$this->_type_checker = new TypeChecker($source, $this);
}
@ -1957,7 +1956,7 @@ class StatementsChecker
if ($method_id && isset($arg->value->returnType)) {
foreach (explode('|', $arg->value->returnType) as $return_type) {
if (TypeChecker::checkMethodParam($return_type, $method_id, $i, $this->_absolute_class, $this->_check_nulls, $this->_file_name, $arg->value->getLine()) === false) {
if (TypeChecker::checkMethodParam($return_type, $method_id, $i, $this->_absolute_class, $this->_file_name, $arg->value->getLine()) === false) {
return false;
}
}
@ -2270,17 +2269,15 @@ class StatementsChecker
$input_types = explode('|', $type);
$input_types = array_flip($input_types);
if ($this->_check_nulls) {
if (isset($input_types['null']) && !$is_nullable) {
if (ExceptionHandler::accepts(
new InvalidArgumentException(
'Argument ' . ($argument_offset + 1) . ' of ' . $method_id . ' cannot be null, possibly null value provided',
$file_name,
$line_number
)
)) {
return false;
}
if (isset($input_types['null']) && !$is_nullable) {
if (ExceptionHandler::accepts(
new InvalidArgumentException(
'Argument ' . ($argument_offset + 1) . ' of ' . $method_id . ' cannot be null, possibly null value provided',
$file_name,
$line_number
)
)) {
return false;
}
}

2
src/CodeInspector/TypeChecker.php
View File

@ -27,7 +27,7 @@ class TypeChecker
/**
* @return bool
*/
public static function checkMethodParam($return_type, $method_id, $arg_offset, $current_class, $check_nulls, $file_name, $line_number)
public static function checkMethodParam($return_type, $method_id, $arg_offset, $current_class, $file_name, $line_number)
{
if ($return_type === 'mixed') {
return true;