Inline @throws support

src/Analyser/NodeScopeResolver.php

@@ -390,6 +390,8 @@ private function processStmtNode(
 
 		$nodeCallback($stmt, $scope);
 
+		$overridingThrowPoints = $this->getOverridingThrowPoints($stmt, $scope);
+
 		if ($stmt instanceof Node\Stmt\Declare_) {
 			$hasYield = false;
 			$throwPoints = [];
@@ -554,6 +556,8 @@ private function processStmtNode(
 				$scope = $result->getScope();
 				$hasYield = $hasYield || $result->hasYield();
 			}
+
+			$throwPoints = $overridingThrowPoints ?? $throwPoints;
 		} elseif ($stmt instanceof Return_) {
 			if ($stmt->expr !== null) {
 				$result = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep());
@@ -567,7 +571,7 @@ private function processStmtNode(
 
 			return new StatementResult($scope, $hasYield, true, [
 				new StatementExitPoint($stmt, $scope),
-			], $throwPoints);
+			], $overridingThrowPoints ?? $throwPoints);
 		} elseif ($stmt instanceof Continue_ || $stmt instanceof Break_) {
 			if ($stmt->num !== null) {
 				$result = $this->processExprNode($stmt->num, $scope, $nodeCallback, ExpressionContext::createDeep());
@@ -581,7 +585,7 @@ private function processStmtNode(
 
 			return new StatementResult($scope, $hasYield, true, [
 				new StatementExitPoint($stmt, $scope),
-			], $throwPoints);
+			], $overridingThrowPoints ?? $throwPoints);
 		} elseif ($stmt instanceof Node\Stmt\Expression) {
 			$earlyTerminationExpr = $this->findEarlyTerminatingExpr($stmt->expr, $scope);
 			$result = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createTopLevel());
@@ -596,9 +600,9 @@ private function processStmtNode(
 			if ($earlyTerminationExpr !== null) {
 				return new StatementResult($scope, $hasYield, true, [
 					new StatementExitPoint($stmt, $scope),
-				], $throwPoints);
+				], $overridingThrowPoints ?? $throwPoints);
 			}
-			return new StatementResult($scope, $hasYield, false, [], $throwPoints);
+			return new StatementResult($scope, $hasYield, false, [], $overridingThrowPoints ?? $throwPoints);
 		} elseif ($stmt instanceof Node\Stmt\Namespace_) {
 			if ($stmt->name !== null) {
 				$scope = $scope->enterNamespace($stmt->name->toString());
@@ -692,7 +696,7 @@ private function processStmtNode(
 			$ifAlwaysTrue = $conditionType instanceof ConstantBooleanType && $conditionType->getValue();
 			$condResult = $this->processExprNode($stmt->cond, $scope, $nodeCallback, ExpressionContext::createDeep());
 			$exitPoints = [];
-			$throwPoints = $condResult->getThrowPoints();
+			$throwPoints = $overridingThrowPoints ?? $condResult->getThrowPoints();
 			$finalScope = null;
 			$alwaysTerminating = true;
 			$hasYield = $condResult->hasYield();
@@ -779,7 +783,7 @@ private function processStmtNode(
 			$this->processTraitUse($stmt, $scope, $nodeCallback);
 		} elseif ($stmt instanceof Foreach_) {
 			$condResult = $this->processExprNode($stmt->expr, $scope, $nodeCallback, ExpressionContext::createDeep());
-			$throwPoints = $condResult->getThrowPoints();
+			$throwPoints = $overridingThrowPoints ?? $condResult->getThrowPoints();
 			$scope = $condResult->getScope();
 			$arrayComparisonExpr = new BinaryOp\NotIdentical(
 				$stmt->expr,
@@ -905,7 +909,7 @@ private function processStmtNode(
 				$finalScope = $finalScope->mergeWith($condScope);
 			}
 
-			$throwPoints = $condResult->getThrowPoints();
+			$throwPoints = $overridingThrowPoints ?? $condResult->getThrowPoints();
 			if (!$neverIterates) {
 				$throwPoints = array_merge($throwPoints, $finalScopeResult->getThrowPoints());
 			}
@@ -1392,15 +1396,45 @@ private function processStmtNode(
 		} elseif ($stmt instanceof Node\Stmt\Nop) {
 			$scope = $this->processStmtVarAnnotation($scope, $stmt, null);
 			$hasYield = false;
-			$throwPoints = [];
+			$throwPoints = $overridingThrowPoints ?? [];
 		} else {
 			$hasYield = false;
-			$throwPoints = [];
+			$throwPoints = $overridingThrowPoints ?? [];
 		}
 
 		return new StatementResult($scope, $hasYield, false, [], $throwPoints);
 	}
 
+	/**
+	 * @param Node\Stmt $statement
+	 * @param MutatingScope $scope
+	 * @return ThrowPoint[]|null
+	 */
+	private function getOverridingThrowPoints(Node\Stmt $statement, MutatingScope $scope): ?array
+	{
+		foreach ($statement->getComments() as $comment) {
+			if (!$comment instanceof Doc) {
+				continue;
+			}
+
+			$function = $scope->getFunction();
+			$resolvedPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(
+				$scope->getFile(),
+				$scope->isInClass() ? $scope->getClassReflection()->getName() : null,
+				$scope->isInTrait() ? $scope->getTraitReflection()->getName() : null,
+				$function !== null ? $function->getName() : null,
+				$comment->getText()
+			);
+
+			$throwsTag = $resolvedPhpDoc->getThrowsTag();
+			if ($throwsTag !== null) {
+				return [ThrowPoint::createExplicit($scope, $throwsTag->getType(), $statement, false)];
+			}
+		}
+
+		return null;
+	}
+
 	private function getCurrentClassReflection(Node\Stmt\ClassLike $stmt, Scope $scope): ClassReflection
 	{
 		$className = $stmt->namespacedName->toString();

src/Rules/PhpDoc/InvalidThrowsPhpDocValueRule.php

@@ -11,7 +11,7 @@
 use PHPStan\Type\VoidType;
 
 /**
- * @implements \PHPStan\Rules\Rule<\PhpParser\Node\FunctionLike>
+ * @implements \PHPStan\Rules\Rule<\PhpParser\Node\Stmt>
  */
 class InvalidThrowsPhpDocValueRule implements \PHPStan\Rules\Rule
 {
@@ -25,7 +25,7 @@ public function __construct(FileTypeMapper $fileTypeMapper)
 
 	public function getNodeType(): string
 	{
-		return \PhpParser\Node\FunctionLike::class;
+		return \PhpParser\Node\Stmt::class;
 	}
 
 	public function processNode(Node $node, Scope $scope): array
@@ -35,11 +35,13 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
+		if ($node instanceof Node\Stmt\Function_ || $node instanceof Node\Stmt\ClassMethod) {
+			return []; // is handled by virtual nodes
+		}
+
 		$functionName = null;
-		if ($node instanceof Node\Stmt\ClassMethod) {
-			$functionName = $node->name->name;
-		} elseif ($node instanceof Node\Stmt\Function_) {
-			$functionName = trim($scope->getNamespace() . '\\' . $node->name->name, '\\');
+		if ($scope->getFunction() !== null) {
+			$functionName = $scope->getFunction()->getName();
 		}
 
 		$resolvedPhpDoc = $this->fileTypeMapper->getResolvedPhpDoc(

tests/PHPStan/Rules/Exceptions/data/unthrown-exception.php

@@ -135,3 +135,28 @@ public function doConsecteur()
 	}
 
 }
+
+class InlineThrows
+{
+
+	public function doFoo()
+	{
+		try {
+			/** @throws \InvalidArgumentException */
+			echo 1;
+		} catch (\InvalidArgumentException $e) {
+
+		}
+	}
+
+	public function doBar()
+	{
+		try {
+			/** @throws \InvalidArgumentException */
+			$i = 1;
+		} catch (\InvalidArgumentException $e) {
+
+		}
+	}
+
+}

tests/PHPStan/Rules/PhpDoc/InvalidPhpDocTagValueRuleTest.php

@@ -82,6 +82,10 @@ public function testRule(): void
 				'PHPDoc tag @var has invalid value ((Foo|Bar): Unexpected token "*/", expected \')\' at offset 18',
 				62,
 			],
+			[
+				'PHPDoc tag @throws has invalid value ((\Exception): Unexpected token "*/", expected \')\' at offset 24',
+				72,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/PhpDoc/InvalidThrowsPhpDocValueRuleTest.php

@@ -47,6 +47,10 @@ public function testRule(): void
 				'PHPDoc tag @throws with type stdClass|void is not subtype of Throwable',
 				103,
 			],
+			[
+				'PHPDoc tag @throws with type stdClass is not subtype of Throwable',
+				118,
+			],
 		]);
 	}
 

tests/PHPStan/Rules/PhpDoc/data/incompatible-throws.php

@@ -111,3 +111,9 @@ function voidUnionWithNotThrowableThrows()
 function exceptionTemplateThrows()
 {
 }
+
+function inlineThrows()
+{
+	/** @throws \stdClass */
+	$i = 1;
+}

tests/PHPStan/Rules/PhpDoc/data/invalid-phpdoc.php

@@ -62,3 +62,14 @@ class Baz
 	private $barProperty;
 
 }
+
+class InlineThrows
+{
+
+	public function doFoo()
+	{
+		/** @throws (\Exception */
+		$i = 1;
+	}
+
+}