danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-21 21:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Fix #563 - improve error message and ignore falsable issues for strtotime

Browse Source
This commit is contained in:
Matt Brown 2018-03-08 14:04:00 -05:00
parent 4873228e52
commit 56bdb924f5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Psalm/Checker/Statements/Expression/BinaryOpChecker.php
View File

@ -20,6 +20,7 @@ use Psalm\StatementsSource;
use Psalm\Type;
use Psalm\Type\Atomic\ObjectLike;
use Psalm\Type\Atomic\TArray;
use Psalm\Type\Atomic\TFalse;
use Psalm\Type\Atomic\TFloat;
use Psalm\Type\Atomic\TInt;
use Psalm\Type\Atomic\TMixed;
@ -515,7 +516,7 @@ class BinaryOpChecker
}
if ($left_type && $right_type) {
if ($left_type->isNullable()) {
if ($left_type->isNullable() && !$left_type->ignore_nullable_issues) {
if ($statements_source && IssueBuffer::accepts(
new PossiblyNullOperand(
'Left operand cannot be nullable, got ' . $left_type,
@ -565,11 +566,19 @@ class BinaryOpChecker
foreach ($left_type->getTypes() as $left_type_part) {
foreach ($right_type->getTypes() as $right_type_part) {
if ($left_type_part instanceof TNull) {
if ($left_type_part instanceof TNull || $right_type_part instanceof TNull) {
// null case is handled above
continue;
}
if ($left_type_part instanceof TFalse && $left_type->ignore_falsable_issues) {
continue;
}
if ($right_type_part instanceof TFalse && $right_type->ignore_falsable_issues) {
continue;
}
if ($left_type_part instanceof TMixed || $right_type_part instanceof TMixed) {
if ($statements_source && $codebase) {
$codebase->analyzer->incrementMixedCount($statements_source->getCheckedFilePath());
@ -753,7 +762,7 @@ class BinaryOpChecker
if ($statements_source && IssueBuffer::accepts(
new InvalidOperand(
'Cannot add a numeric type to a non-numeric type ' . $non_numeric_type,
'Cannot perform a numeric operation with a non-numeric type ' . $non_numeric_type,
new CodeLocation($statements_source, $parent)
),
$statements_source->getSuppressedIssues()

9
tests/FunctionCallTest.php
View File

@ -562,6 +562,15 @@ class FunctionCallTest extends TestCase
return "a";
}',
],
'noInvalidOperandForCoreFunctions' => [
'<?php
function foo(string $a, string $b) : int {
$aTime = strtotime($a);
$bTime = strtotime($b);
return $aTime - $bTime;
}',
],
];
}