Commit 76be530

rvanvelzenondrejmirtes

authored and

committed

Fix closure return type based on by-ref use

1 parent fde174f commit 76be530Copy full SHA for 76be530

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2893,11 +2893,13 @@ private function enterAnonymousFunctionWithoutReflection(`
`2893`	`2893`	`if (!is_string($use->var->name)) {`
`2894`	`2894`	`throw new ShouldNotHappenException();`
`2895`	`2895`	`}`
	`2896`	`+ $variableName = $use->var->name;`
	`2897`	`+ $paramExprString = '$' . $use->var->name;`
`2896`	`2898`	`if ($use->byRef) {`
	`2899`	`+ $variableTypes[$paramExprString] = VariableTypeHolder::createYes(new MixedType());`
	`2900`	`+ $nativeTypes[$paramExprString] = new MixedType();`
`2897`	`2901`	`continue;`
`2898`	`2902`	`}`
`2899`		`- $variableName = $use->var->name;`
`2900`		`- $paramExprString = '$' . $use->var->name;`
`2901`	`2903`	`if ($this->hasVariableType($variableName)->no()) {`
`2902`	`2904`	`$variableType = new ErrorType();`
`2903`	`2905`	`} else {`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -93,4 +93,9 @@ public function testBug3891(): void`
`93`	`93`	`$this->analyse([__DIR__ . '/data/bug-3891.php'], []);`
`94`	`94`	`}`
`95`	`95`
	`96`	`+ public function testBug6806(): void`
	`97`	`+ {`
	`98`	`+ $this->analyse([__DIR__ . '/data/bug-6806.php'], []);`
	`99`	`+ }`
	`100`	`+`
`96`	`101`	`}`

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 Bug6806;`
	`4`	`+`
	`5`	`+function () {`
	`6`	`+ // to mimic dynamic type containing various "type"s`
	`7`	`+ $types = explode(',', $_REQUEST['types']);`
	`8`	`+ // static version throws same issue, though`
	`9`	`+ //$types = [ 'a', 'b' ];`
	`10`	`+ $defs = [ 'first' => [ 'type' => 'a' ], 'second' => [ 'type' => 'b' ] ];`
	`11`	`+`
	`12`	`+ $types = array_fill_keys($types, true);`
	`13`	`+ $defs = array_filter($defs, function($def) use(&$types) { return isset($types[$def['type']]); });`
	`14`	`+};`

Comments

(0)