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

Fix #1665 - allow -if-true & -if-false assertions on static methods

Browse Source
This commit is contained in:
Brown 2019-05-22 17:49:38 -04:00
parent 7601921ecf
commit f728d797cf
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Psalm/Internal/Analyzer/Statements/Expression/AssertionFinder.php
View File

@ -288,7 +288,9 @@ class AssertionFinder
return; return;
} }
if ($conditional instanceof PhpParser\Node\Expr\MethodCall) { if ($conditional instanceof PhpParser\Node\Expr\MethodCall
|| $conditional instanceof PhpParser\Node\Expr\StaticCall
) {
$conditional->assertions = self::processCustomAssertion($conditional, $this_class_name, $source, false); $conditional->assertions = self::processCustomAssertion($conditional, $this_class_name, $source, false);
return; return;
} }

42
tests/AssertTest.php
View File

@ -718,6 +718,48 @@ class AssertTest extends TestCase
unset($options["a"], $options["b"]); unset($options["a"], $options["b"]);
}', }',
], ],
'assertStaticMethodIfFalse' => [
'<?php
class StringUtility {
/**
* @psalm-assert-if-false !null $yStr
*/
public static function isNull(?string $yStr): bool {
if ($yStr === null) {
return true;
}
return false;
}
}
function test(?string $in) : void {
$str = "test";
if(!StringUtility::isNull($in)) {
$str .= $in;
}
}',
],
'assertStaticMethodIfTrue' => [
'<?php
class StringUtility {
/**
* @psalm-assert-if-true !null $yStr
*/
public static function isNotNull(?string $yStr): bool {
if ($yStr === null) {
return true;
}
return false;
}
}
function test(?string $in) : void {
$str = "test";
if(StringUtility::isNotNull($in)) {
$str .= $in;
}
}',
],
]; ];
} }