Infer never return type in closure only with missing or void native r…

…eturn typehint
phpstan · Jan 29, 2021 · 809807a · 809807a
1 parent 136db04
commit 809807a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Type/TypehintHelper.php b/src/Type/TypehintHelper.php
@@ -150,7 +150,14 @@ public static function decideType(
 				}
 			}
 
-			$resultType = $type->isSuperTypeOf(TemplateTypeHelper::resolveToBounds($phpDocType))->yes() ? $phpDocType : $type;
+			if (
+				(!$phpDocType instanceof NeverType || ($type instanceof MixedType && !$type->isExplicitMixed()))
+				&& $type->isSuperTypeOf(TemplateTypeHelper::resolveToBounds($phpDocType))->yes()
+			) {
+				$resultType = $phpDocType;
+			} else {
+				$resultType = $type;
+			}
 
 			if ($type instanceof UnionType) {
 				$addToUnionTypes = [];

diff --git a/tests/PHPStan/Analyser/data/closure-return-type.php b/tests/PHPStan/Analyser/data/closure-return-type.php
@@ -149,6 +149,11 @@ public function doBaz(): void
 			}
 		};
 		assertType('*NEVER*', $f());
+
+		$f = function (): \stdClass {
+			throw new \Exception();
+		};
+		assertType('stdClass', $f());
 	}
 
 }