Commit 99b3d82

authored

Improve ConstantArrayType inference

1 parent b94e179 commit 99b3d82Copy full SHA for 99b3d82

File tree

+19

-3

lines changed

+19

-3

lines changed

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,22 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni`
`371`	`371`
`372`	`372`	`public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type`
`373`	`373`	`{`
	`374`	`+ if ($this->itemType->isConstantArray()->yes() && $valueType->isConstantArray()->yes()) {`
	`375`	`+ $newItemType = $this->itemType;`
	`376`	`+ foreach ($valueType->getConstantArrays() as $constArray) {`
	`377`	`+ foreach ($constArray->getKeyTypes() as $keyType) {`
	`378`	`+ $newItemType = $newItemType->setExistingOffsetValueType($keyType, $constArray->getOffsetValueType($keyType));`
	`379`	`+ }`
	`380`	`+ }`
	`381`	`+`
	`382`	`+ if ($newItemType !== $this->itemType) {`
	`383`	`+ return new self(`
	`384`	`+ $this->keyType,`
	`385`	`+ $newItemType,`
	`386`	`+ );`
	`387`	`+ }`
	`388`	`+ }`
	`389`	`+`
`374`	`390`	`return new self(`
`375`	`391`	`$this->keyType,`
`376`	`392`	`TypeCombinator::union($this->itemType, $valueType),`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,16 +13,16 @@ function demo(): void`
`13`	`13`	`$outerList[$id] = [];`
`14`	`14`	`array_push($outerList[$id], []);`
`15`	`15`	`}`
`16`		`- assertType('non-empty-array<1\|2, array{}\|array{array{}}>', $outerList);`
	`16`	`+ assertType('non-empty-array<1\|2, array{array{}}>', $outerList);`
`17`	`17`
`18`	`18`	`foreach ($outerList as $key => $outerElement) {`
`19`	`19`	`$result = false;`
`20`	`20`
`21`		`- assertType('array{}\|array{array{}}', $outerElement);`
	`21`	`+ assertType('array{array{}}', $outerElement);`
`22`	`22`	`foreach ($outerElement as $innerElement) {`
`23`	`23`	`$result = true;`
`24`	`24`	`}`
`25`		`- assertType('bool', $result);// could be 'true'`
	`25`	`+ assertType('true', $result);`
`26`	`26`
`27`	`27`	`}`
`28`	`28`	`}`

Comments

(0)