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

Be more accurate when assertion is incorrect

Browse Source 
Ref #2452
This commit is contained in:
Matthew Brown 2019-12-10 09:26:46 -05:00
parent 8494f02008
commit 750d4b4f4f
2 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/Psalm/Internal/Type/AssertionReconciler.php
View File

@ -1041,7 +1041,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1100,7 +1102,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1155,7 +1159,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1220,7 +1226,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1283,7 +1291,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1517,7 +1527,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1591,7 +1603,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**
@ -1681,7 +1695,9 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
$failed_reconciliation = 2;
return Type::getMixed();
return $existing_var_type->from_docblock
? Type::getMixed()
: Type::getEmpty();
}
/**

9
tests/TypeReconciliation/ConditionalTest.php
View File

@ -2213,6 +2213,15 @@ class ConditionalTest extends \Psalm\Tests\TestCase
}
}'
],
'ignoreRedundantAssertion' => [
'<?php
function gimmeAString(?string $v): string {
/** @psalm-suppress TypeDoesNotContainType */
assert(is_string($v) || is_object($v));
return $v;
}'
],
];
}