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

Fix return {expr} checks for void functions

Browse Source
This commit is contained in:
Matt Brown 2017-12-14 12:50:02 -05:00
parent d440e4bbb1
commit 52c414f1d2
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Checker/SourceChecker.php
View File

@ -172,7 +172,7 @@ abstract class SourceChecker implements StatementsSource
throw new \UnexpectedValueException('$source cannot be null');
}
return $this->source->addSuppressedIssues($new_issues);
$this->source->addSuppressedIssues($new_issues);
}
/**
@ -186,7 +186,7 @@ abstract class SourceChecker implements StatementsSource
throw new \UnexpectedValueException('$source cannot be null');
}
return $this->source->removeSuppressedIssues($new_issues);
$this->source->removeSuppressedIssues($new_issues);
}
/**

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

@ -908,6 +908,10 @@ class StatementsChecker extends SourceChecker implements StatementsSource
$stmt->inferredType = Type::parseString($var_comment->type);
} elseif (isset($stmt->expr->inferredType)) {
$stmt->inferredType = $stmt->expr->inferredType;
if ($stmt->inferredType->isVoid()) {
$stmt->inferredType = Type::getNull();
}
} else {
$stmt->inferredType = Type::getMixed();
}

9
tests/ReturnTypeTest.php
View File

@ -538,6 +538,15 @@ class ReturnTypeTest extends TestCase
}',
'error_message' => 'ReservedWord',
],
'disallowReturningExplicitVoid' => [
'<?php
function returnsVoid() : void {}
function alsoReturnsVoid() : void {
return returnsVoid();
}',
'error_message' => 'InvalidReturnStatement',
],
];
}
}