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

Support int separators in docblocks

Browse Source 
PHP understands `1_000` to be `1000`, so there's no reason why it
shouldn't be recognized in docblocks as well.
This commit is contained in:
Bruce Weirdan 2023-03-11 23:14:40 -04:00
parent f48b79063c
commit b37c56613b
No known key found for this signature in database
GPG Key ID: CFC3AAB181751B0D
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Psalm/Internal/Type/TypeParser.php
View File

@ -91,6 +91,7 @@ use function stripslashes;
use function strlen;
use function strpos;
use function strtolower;
use function strtr;
use function substr;
/**
@ -420,8 +421,8 @@ class TypeParser
return new TLiteralFloat((float) $parse_tree->value, $from_docblock);
}
if (preg_match('/^\-?(0|[1-9][0-9]*)$/', $parse_tree->value)) {
return new TLiteralInt((int) $parse_tree->value, $from_docblock);
if (preg_match('/^\-?(0|[1-9]([0-9_]*[0-9])?)$/', $parse_tree->value)) {
return new TLiteralInt((int) strtr($parse_tree->value, ['_' => '']), $from_docblock);
}
if (!preg_match('@^(\$this|\\\\?[a-zA-Z_\x7f-\xff][\\\\\-0-9a-zA-Z_\x7f-\xff]*)$@', $parse_tree->value)) {

20
tests/TypeParseTest.php
View File

@ -1032,6 +1032,26 @@ class TypeParseTest extends TestCase
);
}
public function testSingleLiteralIntWithSeparators(): void
{
$this->assertSame('10', Type::parseString('1_0')->getId());
}
public function testIntRangeWithSeparators(): void
{
$this->assertSame('int<10, 20>', Type::parseString('int<1_0, 2_0>')->getId());
}
public function testLiteralIntUnionWithSeparators(): void
{
$this->assertSame('10|20', Type::parseString('1_0|2_0')->getId());
}
public function testIntMaskWithIntsWithSeparators(): void
{
$this->assertSame('0|10|20|30', Type::parseString('int-mask<1_0, 2_0>')->getId());
}
public function testSingleLiteralFloat(): void
{
$this->assertSame(