Commit b50ac58

authored

Narrow offset after isset() on list

1 parent 0626464 commit b50ac58Copy full SHA for b50ac58

File tree

+57

-4

lines changed

+57

-4

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,11 @@ public static function narrowOffsetKeyType(Type $varType, Type $keyType): ?Type`
`71`	`71`	`return $narrowedKey;`
`72`	`72`	`} elseif ($varIterableKeyType->isInteger()->yes() && $keyType->isString()->yes()) {`
`73`	`73`	`return TypeCombinator::intersect($varIterableKeyType->toString(), $keyType);`
	`74`	`+ } elseif ($varType->isList()->yes()) {`
	`75`	`+ return TypeCombinator::intersect(`
	`76`	`+ $varIterableKeyType,`
	`77`	`+ $keyType,`
	`78`	`+ );`
`74`	`79`	`}`
`75`	`80`
`76`	`81`	`return new MixedType(`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -92,9 +92,9 @@ function testShouldLooseListbyAst(array $list, int $i): void`
`92`	`92`
`93`	`93`	`assertType('list<int>', $list);`
`94`	`94`	`$list[1+$i] = 21;`
`95`		`- assertType('non-empty-array<int, int>', $list);`
	`95`	`+ assertType('non-empty-array<int<0, max>, int>', $list);`
`96`	`96`	`}`
`97`		`- assertType('array<int, int>', $list);`
	`97`	`+ assertType('array<int<0, max>, int>', $list);`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/** @param list<int> $list */`
`@@ -103,7 +103,7 @@ function testShouldLooseListbyAst2(array $list, int $i): void`
`103`	`103`	`if (isset($list[$i])) {`
`104`	`104`	`assertType('list<int>', $list);`
`105`	`105`	`$list[2+$i] = 21;`
`106`		`- assertType('non-empty-array<int, int>', $list);`
	`106`	`+ assertType('non-empty-array<int<0, max>, int>', $list);`
`107`	`107`	`}`
`108`		`- assertType('array<int, int>', $list);`
	`108`	`+ assertType('array<int<0, max>, int>', $list);`
`109`	`109`	`}`

Lines changed: 48 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,48 @@`
	`1`	`+<?php // lint >= 8.0`
	`2`	`+`
	`3`	`+namespace Bug12933;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+/**`
	`8`	`+ * @phpstan-type record array{id: positive-int, name: string}`
	`9`	`+ */`
	`10`	`+class Collection`
	`11`	`+{`
	`12`	`+ /** @param list<record> $list */`
	`13`	`+ public function __construct(`
	`14`	`+ public array $list`
	`15`	`+ )`
	`16`	`+ {`
	`17`	`+ }`
	`18`	`+`
	`19`	`+ public function updateNameIsset(int $index, string $name): void`
	`20`	`+ {`
	`21`	`+ assert(isset($this->list[$index]));`
	`22`	`+ assertType('int<0, max>', $index);`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ public function updateNameArrayKeyExists(int $index, string $name): void`
	`26`	`+ {`
	`27`	`+ assert(array_key_exists($index, $this->list));`
	`28`	`+ assertType('int<0, max>', $index);`
	`29`	`+ }`
	`30`	`+`
	`31`	`+ /**`
	`32`	`+ * @param int<-5, 5> $index`
	`33`	`+ */`
	`34`	`+ public function issetNarrowsIntRange(int $index, string $name): void`
	`35`	`+ {`
	`36`	`+ assert(isset($this->list[$index]));`
	`37`	`+ assertType('int<0, 5>', $index);`
	`38`	`+ }`
	`39`	`+`
	`40`	`+ /**`
	`41`	`+ * @param int<5, 15> $index`
	`42`	`+ */`
	`43`	`+ public function issetNotWidensIntRange(int $index, string $name): void`
	`44`	`+ {`
	`45`	`+ assert(isset($this->list[$index]));`
	`46`	`+ assertType('int<5, 15>', $index);`
	`47`	`+ }`
	`48`	`+}`

Comments

(0)