Commit 12adfbe

rvanvelzenondrejmirtes

authored and

committed

Support literal-string as array key

1 parent ba8af60 commit 12adfbeCopy full SHA for 12adfbe

File tree

+21

-2

lines changed

+21

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -350,15 +350,19 @@ public static function castToArrayKeyType(Type $offsetType): Type`
`350`	`350`	`return new UnionType([new ConstantIntegerType(0), new ConstantIntegerType(1)]);`
`351`	`351`	`}`
`352`	`352`
	`353`	`+ if ($offsetType instanceof UnionType) {`
	`354`	`+ return $traverse($offsetType);`
	`355`	`+ }`
	`356`	`+`
`353`	`357`	`if ($offsetType instanceof FloatType \|\| $offsetType->isNumericString()->yes()) {`
`354`	`358`	`return new IntegerType();`
`355`	`359`	`}`
`356`	`360`
`357`		`- if ($offsetTypeinstanceof StringType \|\| $offsetType->isNonEmptyString()->yes()) {`
	`361`	`+ if ($offsetType->isString()->yes()) {`
`358`	`362`	`return $offsetType;`
`359`	`363`	`}`
`360`	`364`
`361`		`- if ($offsetType instanceof UnionType \|\| $offsetTypeinstanceofIntersectionType) {`
	`365`	`+ if ($offsetType instanceof IntersectionType) {`
`362`	`366`	`return $traverse($offsetType);`
`363`	`367`	`}`
`364`	`368`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -910,6 +910,7 @@ public function dataFileAsserts(): iterable`
`910`	`910`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7391.php');`
`911`	`911`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/finally-scope.php');`
`912`	`912`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7387.php');`
	`913`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-7353.php');`
`913`	`914`	`}`
`914`	`915`
`915`	`916`	`/**`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,14 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace Bug7353;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+class HelloWorld`
	`8`	`+{`
	`9`	`+ /** @param array<literal-string, mixed> $data */`
	`10`	`+ public function sayHello(array $data): void`
	`11`	`+ {`
	`12`	`+ assertType('array<literal-string, mixed>', $data);`
	`13`	`+ }`
	`14`	`+}`

Comments

(0)