danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-26 20:34:47 +01:00
Code Issues Projects Releases Wiki Activity

parse array{} into an empty array

Browse Source
This commit is contained in:
orklah 2022-01-04 10:48:29 +01:00
parent f5dc2ee964
commit 030195a395
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Psalm/Internal/Type/ParseTreeCreator.php
View File

@ -751,6 +751,13 @@ class ParseTreeCreator
$new_parent
);
++$this->t;
$nexter_token = $this->t + 1 < $this->type_token_count ? $this->type_tokens[$this->t + 1] : null;
if ($nexter_token !== null && $nexter_token[0] === '}') {
$new_leaf->terminated = true;
++$this->t;
}
break;
case '(':

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

@ -1235,7 +1235,7 @@ class TypeParser
/**
* @param array<string, array<string, Union>> $template_type_map
* @param array<string, TypeAlias> $type_aliases
* @return TCallableKeyedArray|TKeyedArray|TObjectWithProperties
* @return TCallableKeyedArray|TKeyedArray|TObjectWithProperties|TArray
* @throws TypeParseTreeException
*/
private static function getTypeFromKeyedArrayTree(
@ -1314,7 +1314,7 @@ class TypeParser
}
if (!$properties) {
throw new TypeParseTreeException('No properties supplied for TKeyedArray');
return new TArray([Type::getNever(), Type::getNever()]);
}
if ($type === 'object') {

8
tests/TypeParseTest.php
View File

@ -893,6 +893,14 @@ class TypeParseTest extends TestCase
);
}
public function testEmptyArrayShape(): void
{
$this->assertSame(
'array<never, never>',
(string)Type::parseString('array{}')
);
}
public function testSingleLiteralInt(): void
{
$this->assertSame(