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

Fix invalid InvalidParamDefault error when comparing to false

Browse Source
This commit is contained in:
Matthew Brown 2017-01-19 01:12:19 -05:00
parent 3510757d89
commit 27a018095b
3 changed files with 79 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,7 +347,9 @@ class StatementsChecker extends SourceChecker implements StatementsSource
public static function getSimpleType(PhpParser\Node\Expr $stmt)
{
if ($stmt instanceof PhpParser\Node\Expr\ConstFetch) {
if (strtolower($stmt->name->parts[0]) === 'false' || strtolower($stmt->name->parts[0]) === 'true') {
if (strtolower($stmt->name->parts[0]) === 'false') {
return Type::getFalse();
} elseif (strtolower($stmt->name->parts[0]) === 'true') {
return Type::getBool();
} elseif (strtolower($stmt->name->parts[0]) === 'null') {
return Type::getNull();

54
tests/FunctionCallTest.php
View File

@ -177,6 +177,60 @@ class FunctionCallTest extends PHPUnit_Framework_TestCase
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage InvalidParamDefault
* @return void
*/
public function testInvalidParamDefault()
{
$stmts = self::$parser->parse('<?php
function f(int $p = false) {}
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @expectedException \Psalm\Exception\CodeException
* @expectedExceptionMessage InvalidParamDefault
* @return void
*/
public function testInvalidDocblockParamDefault()
{
$stmts = self::$parser->parse('<?php
/**
* @param int $p
* @return void
*/
function f($p = false) {}
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @return void
*/
public function testValidDocblockParamDefault()
{
$stmts = self::$parser->parse('<?php
/**
* @param int|false $p
* @return void
*/
function f($p = false) {}
');
$file_checker = new FileChecker('somefile.php', $this->project_checker, $stmts);
$context = new Context();
$file_checker->visitAndAnalyzeMethods($context);
}
/**
* @return void
*/

22
tests/TypeReconciliationTest.php
View File

@ -211,6 +211,28 @@ class TypeReconciliationTest extends PHPUnit_Framework_TestCase
);
}
/**
* @return void
*/
public function testUnionContains()
{
$this->assertTrue(
TypeChecker::isContainedBy(
Type::parseString('string'),
Type::parseString('string|false'),
$this->file_checker
)
);
$this->assertTrue(
TypeChecker::isContainedBy(
Type::parseString('false'),
Type::parseString('string|false'),
$this->file_checker
)
);
}
/**
* @return void
*/