Commit b973be4

rvanvelzenondrejmirtes

authored and

committed

Fix coalescing on an optional array offset

1 parent 2be4c7c commit b973be4Copy full SHA for b973be4

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1591,9 +1591,7 @@ private function resolveType(string $exprString, Expr $node): Type`
`1591`	`1591`	`return TypeCombinator::removeNull($leftType);`
`1592`	`1592`	`}`
`1593`	`1593`
`1594`		`- $rightType = $this->filterByFalseyValue(`
`1595`		`- new BinaryOp\NotIdentical($node->left, new ConstFetch(new Name('null'))),`
`1596`		`- )->getType($node->right);`
	`1594`	`+ $rightType = $this->filterByFalseyValue(new Expr\Isset_([$node->left]))->getType($node->right);`
`1597`	`1595`
`1598`	`1596`	`if ($result === null) {`
`1599`	`1597`	`return TypeCombinator::union(`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1408,6 +1408,7 @@ public function dataFileAsserts(): iterable`
`1408`	`1408`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/conditional-vars.php');`
`1409`	`1409`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-5961.php');`
`1410`	`1410`	`yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10189.php');`
	`1411`	`+ yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-10317.php');`
`1411`	`1412`	`}`
`1412`	`1413`
`1413`	`1414`	`/**`

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 Bug10317;`
	`4`	`+`
	`5`	`+use function PHPStan\Testing\assertType;`
	`6`	`+`
	`7`	`+/**`
	`8`	`+ * @param array{'foo': string, 'bar'?: string} $array`
	`9`	`+ */`
	`10`	`+function myfunction(array $array): void`
	`11`	`+{`
	`12`	`+ $string = $array['bar'] ?? $array['foo'];`
	`13`	`+ assertType('string', $string);`
	`14`	`+}`

Comments

(0)