Handle exception thrown from callable object's __invoke method

Author: VincentLanglet

src/Analyser/NodeScopeResolver.php

@@ -1956,8 +1956,23 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						$nameType->getCallableParametersAcceptors($scope),
 					);
 				}
+
 				$nameResult = $this->processExprNode($expr->name, $scope, $nodeCallback, $context->enterDeep());
 				$throwPoints = $nameResult->getThrowPoints();
+				if (
+					$nameType->isObject()->yes()
+					&& $nameType->isCallable()->yes()
+					&& (new ObjectType(Closure::class))->isSuperTypeOf($nameType)->no()
+				) {
+					$invokeResult = $this->processExprNode(
+						new MethodCall($expr->name, '__invoke', $expr->getArgs(), $expr->getAttributes()),
+						$scope,
+						static function (): void {
+						},
+						$context->enterDeep(),
+					);
+					$throwPoints = array_merge($throwPoints, $invokeResult->getThrowPoints());
+				}
 				$scope = $nameResult->getScope();
 			} elseif ($this->reflectionProvider->hasFunction($expr->name, $scope)) {
 				$functionReflection = $this->reflectionProvider->getFunction($expr->name, $scope);

tests/PHPStan/Rules/Exceptions/TooWideMethodThrowTypeRuleTest.php

@@ -43,4 +43,9 @@ public function testRule(): void
 		]);
 	}
 
+	public function testBug6233(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-6233.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Exceptions/data/bug-6233.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Bug6233;
+
+class TestClass {
+	/**
+	 * @throws \Exception
+	 **/
+	public function __invoke() {
+		throw new \Exception();
+	}
+}
+
+class TestClass2 {
+	/**
+	 * @throws \Exception
+	 **/
+	public function __invoke() {
+		throw new \Exception();
+	}
+}
+
+class Container {
+	/**
+	 * @throws \Exception
+	 **/
+	public function test(TestClass $class) {
+		$class();
+	}
+	/**
+	 * @throws \Exception
+	 **/
+	public function testNew() {
+		(new TestClass)();
+	}
+	/**
+	 * @param TestClass|TestClass2 $class
+	 *
+	 * @throws \Exception
+	 **/
+	public function testUnion(object $class) {
+		$class();
+	}
+}