Commit 300b7b2

authored

infer non-empty-list/array after array_key_exists($i, $arr) (#4440)

1 parent 27ccf57 commit 300b7b2Copy full SHA for 300b7b2

File tree

+71

-6

lines changed

+71

-6

lines changed

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,13 +66,19 @@ public function specifyTypes(`
`66`	`66`	`&& !$keyType instanceof ConstantStringType`
`67`	`67`	`) {`
`68`	`68`	`if ($context->true()) {`
`69`		`- if ($arrayType->isIterableAtLeastOnce()->no()) {`
`70`		`- return $this->typeSpecifier->create(`
	`69`	`+ $specifiedTypes = new SpecifiedTypes();`
	`70`	`+`
	`71`	`+ if (count($keyType->getConstantScalarTypes()) <= 1) {`
	`72`	`+ $specifiedTypes = $specifiedTypes->unionWith($this->typeSpecifier->create(`
`71`	`73`	`$array,`
`72`	`74`	`new NonEmptyArrayType(),`
`73`	`75`	`$context,`
`74`	`76`	`$scope,`
`75`		`- );`
	`77`	`+ ));`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ if ($arrayType->isIterableAtLeastOnce()->no()) {`
	`81`	`+ return $specifiedTypes;`
`76`	`82`	`}`
`77`	`83`
`78`	`84`	`$arrayKeyType = $arrayType->getIterableKeyType();`
`@@ -82,12 +88,12 @@ public function specifyTypes(`
`82`	`88`	`$arrayKeyType = TypeCombinator::union($arrayKeyType, $arrayKeyType->toString());`
`83`	`89`	`}`
`84`	`90`
`85`		`- $specifiedTypes = $this->typeSpecifier->create(`
	`91`	`+ $specifiedTypes = $specifiedTypes->unionWith($this->typeSpecifier->create(`
`86`	`92`	`$key,`
`87`	`93`	`$arrayKeyType,`
`88`	`94`	`$context,`
`89`	`95`	`$scope,`
`90`		`- );`
	`96`	`+ ));`
`91`	`97`
`92`	`98`	`$arrayDimFetch = new ArrayDimFetch(`
`93`	`99`	`$array,`

Lines changed: 29 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,29 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+namespace Bug13674a;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+class HelloWorld`
	`8`	`+{`
	`9`	`+ /**`
	`10`	`+ * @param array<int> $arrayA`
	`11`	`+ * @param list<int> $listA`
	`12`	`+ */`
	`13`	`+ public function sayHello($arrayA, $listA, int $i): void`
	`14`	`+ {`
	`15`	`+ if (array_key_exists($i, $arrayA)) {`
	`16`	`+ assertType('non-empty-array<int>', $arrayA);`
	`17`	`+ } else {`
	`18`	`+ assertType('array<int>', $arrayA);`
	`19`	`+ }`
	`20`	`+ assertType('array<int>', $arrayA);`
	`21`	`+`
	`22`	`+ if (array_key_exists($i, $listA)) {`
	`23`	`+ assertType('non-empty-list<int>', $listA);`
	`24`	`+ } else {`
	`25`	`+ assertType('list<int>', $listA);`
	`26`	`+ }`
	`27`	`+ assertType('list<int>', $listA);`
	`28`	`+ }`
	`29`	`+}`

Lines changed: 10 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -406,6 +406,16 @@ public function testBug7000(): void`
`406`	`406`	`]);`
`407`	`407`	`}`
`408`	`408`
	`409`	`+ public function testBug7000b(): void`
	`410`	`+ {`
	`411`	`+ $this->analyse([__DIR__ . '/data/bug-7000b.php'], [`
	`412`	`+ [`
	`413`	`+ "Offset 'require'\|'require-dev' might not exist on array{require?: array<string, string>, require-dev?: array<string, string>}.",`
	`414`	`+ 16,`
	`415`	`+ ],`
	`416`	`+ ]);`
	`417`	`+ }`
	`418`	`+`
`409`	`419`	`public function testBug6508(): void`
`410`	`420`	`{`
`411`	`421`	`$this->analyse([__DIR__ . '/data/bug-6508.php'], []);`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,20 @@`
	`1`	`+<?php declare(strict_types = 1);`
	`2`	`+`
	`3`	`+namespace Bug7000b;`
	`4`	`+`
	`5`	`+class Foo`
	`6`	`+{`
	`7`	`+ public function doBar(): void`
	`8`	`+ {`
	`9`	`+ /** @var array{require?: array<string, string>, require-dev?: array<string, string>} $composer */`
	`10`	`+ $composer = array();`
	`11`	`+ /** @var 'require'\|'require-dev' $foo */`
	`12`	`+ $foo = '';`
	`13`	`+ foreach (array('require', 'require-dev') as $linkType) {`
	`14`	`+ if (array_key_exists($linkType, $composer)) {`
	`15`	`+ foreach ($composer[$linkType] as $x) {} // should not report error`
	`16`	`+ foreach ($composer[$foo] as $x) {} // should report error. It can be $linkType = 'require', $foo = 'require-dev'`
	`17`	`+ }`
	`18`	`+ }`
	`19`	`+ }`
	`20`	`+}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public function doFoo(array $percentageIntervals, array $changes): void`
`15`	`15`	`if ($percentageInterval->isInInterval((float) $changeInPercents)) {`
`16`	`16`	`$key = $percentageInterval->getFormatted();`
`17`	`17`	`if (array_key_exists($key, $intervalResults)) {`
`18`		`- assertType('array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);`
	`18`	`+ assertType('non-empty-array<array{itemsCount: mixed, interval: mixed}>', $intervalResults);`
`19`	`19`	`assertType('array{itemsCount: mixed, interval: mixed}', $intervalResults[$key]);`
`20`	`20`	`$intervalResults[$key]['itemsCount'] += $itemsCount;`
`21`	`21`	`assertType('non-empty-array<array{itemsCount: (array\|float\|int), interval: mixed}>', $intervalResults);`

Comments

(0)