Fixed issue with arrow function type inference and TooWideArrowFunctionReturnTypehintRule

ondrejmirtes · ondrejmirtes · commit 55819285fa72 · 2020-03-17T15:59:43.000+01:00
diff --git a/src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php b/src/Rules/TooWideTypehints/TooWideArrowFunctionReturnTypehintRule.php
@@ -29,7 +29,11 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		$expr = $node->getOriginalNode()->expr;
+		$arrowFunction = $node->getOriginalNode();
+		if ($arrowFunction->returnType === null) {
+			return [];
+		}
+		$expr = $arrowFunction->expr;
 		if ($expr instanceof Node\Expr\YieldFrom || $expr instanceof Node\Expr\Yield_) {
 			return [];
 		}
diff --git a/tests/PHPStan/Rules/TooWideTypehints/data/tooWideArrowFunctionReturnType.php b/tests/PHPStan/Rules/TooWideTypehints/data/tooWideArrowFunctionReturnType.php
@@ -16,4 +16,11 @@ public function doFoo(?string $nullableString)
 		fn (): ?string => $nullableString;
 	}
 
+	public function doBar()
+	{
+		/** @var string[][] $data */
+		$data = doFoo();
+		array_reduce($data, static fn (int $carry, array $item) => $carry + $item['total_count'], 0);
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,11 @@ public function processNode(Node $node, Scope $scope): array`
`29`	`29`	`return [];`
`30`	`30`	`}`
`31`	`31`
`32`		`- $expr = $node->getOriginalNode()->expr;`
	`32`	`+ $arrowFunction = $node->getOriginalNode();`
	`33`	`+ if ($arrowFunction->returnType === null) {`
	`34`	`+ return [];`
	`35`	`+ }`
	`36`	`+ $expr = $arrowFunction->expr;`
`33`	`37`	`if ($expr instanceof Node\Expr\YieldFrom \|\| $expr instanceof Node\Expr\Yield_) {`
`34`	`38`	`return [];`
`35`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,11 @@ public function doFoo(?string $nullableString)`
`16`	`16`	`fn (): ?string => $nullableString;`
`17`	`17`	`}`
`18`	`18`
	`19`	`+ public function doBar()`
	`20`	`+ {`
	`21`	`+ /** @var string[][] $data */`
	`22`	`+ $data = doFoo();`
	`23`	`+ array_reduce($data, static fn (int $carry, array $item) => $carry + $item['total_count'], 0);`
	`24`	`+ }`
	`25`	`+`
`19`	`26`	`}`