Commit 674109b

staabmondrejmirtes

authored and

committed

prevent crash

1 parent dc9e2e9 commit 674109bCopy full SHA for 674109b

File tree

+18

-0

lines changed

+18

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`	`use PHPStan\Type\Type;`
`21`	`21`	`use PHPStan\Type\TypeCombinator;`
`22`	`22`	`use PHPStan\Type\UnionType;`
	`23`	`+use function array_key_exists;`
`23`	`24`	`use function count;`
`24`	`25`	`use function is_int;`
`25`	`26`	`use function is_string;`
`@@ -77,6 +78,10 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,`
`77`	`78`
`78`	`79`	`$builder = ConstantArrayTypeBuilder::createEmpty();`
`79`	`80`	`foreach ($keyTypes as $i => $keyType) {`
	`81`	`+ if (!array_key_exists($i, $valueTypes)) {`
	`82`	`+ $results = [];`
	`83`	`+ break 2;`
	`84`	`+ }`
`80`	`85`	`$valueType = $valueTypes[$i];`
`81`	`86`	`$builder->setOffsetValueType($keyType, $valueType);`
`82`	`87`	`}`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,19 @@ function withUnionConstArraysDifferentArraysCount(): void`
`113`	`113`	`assertType("non-empty-array<1\|'2'\|'3', 'apple'\|'avocado'\|'banana'\|'pear'>", array_combine($a, $b));`
`114`	`114`	`}`
`115`	`115`
	`116`	`+function withUnionConstArraysAndInvalidKeys(bool $bool): void`
	`117`	`+{`
	`118`	`+ if (rand(0, 1)) {`
	`119`	`+ $a = [$bool];`
	`120`	`+ $b = ['avocado'];`
	`121`	`+ } else {`
	`122`	`+ $a = ["2", $bool];`
	`123`	`+ $b = ['apple', 'banana'];`
	`124`	`+ }`
	`125`	`+`
	`126`	`+ assertType("non-empty-array<''\|'1'\|'2', 'apple'\|'avocado'\|'banana'>", array_combine($a, $b));`
	`127`	`+}`
	`128`	`+`
`116`	`129`	`/**`
`117`	`130`	`* @param non-empty-array<int, 'foo'\|'bar'\|'baz'> $a`
`118`	`131`	`* @param non-empty-array<int, 'apple'\|'avocado'\|'banana'> $b`

Comments

(0)