danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2025-01-22 05:41:20 +01:00
Code Issues Projects Releases Wiki Activity

Fix #2121 - no internal error on funk assertion syntax

Browse Source
This commit is contained in:
Matthew Brown 2019-09-21 21:22:31 -04:00
parent ae46c9e132
commit 264131c211
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,7 @@ use Psalm\Type\Atomic\TTemplateParam;
use Psalm\Type\Atomic\TTrue;
use function strpos;
use function substr;
use Psalm\Issue\InvalidDocblock;
class AssertionReconciler extends \Psalm\Type\Reconciler
{
@ -585,7 +586,23 @@ class AssertionReconciler extends \Psalm\Type\Reconciler
}
}
$new_type_part = Atomic::create($assertion, null, $template_type_map);
try {
$new_type_part = Atomic::create($assertion, null, $template_type_map);
} catch (\Psalm\Exception\TypeParseTreeException $e) {
$new_type_part = new TMixed();
if ($code_location) {
if (IssueBuffer::accepts(
new InvalidDocblock(
$assertion . ' cannot be used in an assertion',
$code_location
),
$suppressed_issues
)) {
// fall through
}
}
}
if ($new_type_part instanceof TNamedObject
&& ((

16
tests/AssertTest.php
View File

@ -888,6 +888,22 @@ class AssertTest extends TestCase
}',
'error_message' => 'TypeDoesNotContainType',
],
'noExceptionOnMalformedAssertion' => [
'<?php
/**
* @param mixed[] $a
*/
function one(array $a): void {
isInts($a);
}
/**
* @psalm-assert int[] $value
* @param mixed $value
*/
function isInts($value): void {}',
'error_message' => 'InvalidDocblock',
],
];
}
}