fix method calls

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -2552,7 +2552,6 @@ function (MutatingScope $scope) use ($stmt, $expr, $nodeCallback, $context): Exp
 				$scope = $nameResult->getScope();
 				$throwPoints = $nameResult->getThrowPoints();
 				$impurePoints = $nameResult->getImpurePoints();
-				$isAlwaysTerminating = $nameResult->isAlwaysTerminating();
 				if (
 					$nameType->isObject()->yes()
 					&& $nameType->isCallable()->yes()
@@ -2568,7 +2567,7 @@ static function (): void {
 					);
 					$throwPoints = array_merge($throwPoints, $invokeResult->getThrowPoints());
 					$impurePoints = array_merge($impurePoints, $invokeResult->getImpurePoints());
-					$isAlwaysTerminating = $isAlwaysTerminating || $invokeResult->isAlwaysTerminating();
+					$isAlwaysTerminating = $invokeResult->isAlwaysTerminating();
 				} elseif ($parametersAcceptor instanceof CallableParametersAcceptor) {
 					$callableThrowPoints = array_map(static fn (SimpleThrowPoint $throwPoint) => $throwPoint->isExplicit() ? ThrowPoint::createExplicit($scope, $throwPoint->getType(), $expr, $throwPoint->canContainAnyThrowable()) : ThrowPoint::createImplicit($scope, $expr), $parametersAcceptor->getThrowPoints());
 					if (!$this->implicitThrows) {
@@ -2815,6 +2814,7 @@ static function (): void {
 			$hasYield = $result->hasYield();
 			$throwPoints = $result->getThrowPoints();
 			$impurePoints = $result->getImpurePoints();
+			$isAlwaysTerminating = $result->isAlwaysTerminating();
 			$scope = $result->getScope();
 			if (isset($closureCallScope)) {
 				$scope = $scope->restoreOriginalScopeAfterClosureBind($originalScope);
@@ -2921,6 +2921,7 @@ static function (): void {
 			$hasYield = $hasYield || $result->hasYield();
 			$throwPoints = array_merge($throwPoints, $result->getThrowPoints());
 			$impurePoints = array_merge($impurePoints, $result->getImpurePoints());
+			$isAlwaysTerminating = $isAlwaysTerminating || $result->isAlwaysTerminating();
 		} elseif ($expr instanceof Expr\NullsafeMethodCall) {
 			$nonNullabilityResult = $this->ensureShallowNonNullability($scope, $scope, $expr->var);
 			$exprResult = $this->processExprNode($stmt, new MethodCall($expr->var, $expr->name, $expr->args, array_merge($expr->getAttributes(), ['virtualNullsafeMethodCall' => true])), $nonNullabilityResult->getScope(), $nodeCallback, $context);
@@ -3094,6 +3095,7 @@ static function (): void {
 			$hasYield = $hasYield || $result->hasYield();
 			$throwPoints = array_merge($throwPoints, $result->getThrowPoints());
 			$impurePoints = array_merge($impurePoints, $result->getImpurePoints());
+			$isAlwaysTerminating = $isAlwaysTerminating || $result->isAlwaysTerminating();
 		} elseif ($expr instanceof PropertyFetch) {
 			$scopeBeforeVar = $scope;
 			$result = $this->processExprNode($stmt, $expr->var, $scope, $nodeCallback, $context->enterDeep());

tests/PHPStan/Rules/DeadCode/UnreachableStatementRuleTest.php

@@ -276,7 +276,23 @@ public function testBug13232a(): void
 			],
 			[
 				'Unreachable statement - code above always terminates.',
-				40,
+				38,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				44,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				52,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				61,
+			],
+			[
+				'Unreachable statement - code above always terminates.',
+				70,
 			],
 		]);
 	}

tests/PHPStan/Rules/DeadCode/data/bug-13232a.php

@@ -28,7 +28,19 @@ public function sayHe(): void
 		$callable = function (): never {
 			exit();
 		};
-		echo sprintf("Hello, %s no way", $callable);
+		echo sprintf("Hello, %s no way", $callable());
+		echo 'this will never happen';
+	}
+
+	public function sayHe2(): void
+	{
+		$this->doFoo($this->neverReturnsMethod());
+		echo 'this will never happen';
+	}
+
+	public function sayHe3(): void
+	{
+		self::doStaticFoo($this->neverReturnsMethod());
 		echo 'this will never happen';
 	}
 
@@ -40,9 +52,31 @@ public function sayHuu(): void
 		echo 'this will never happen';
 	}
 
+	public function sayClosure(): void
+	{
+		$callable = function (): never {
+			exit();
+		};
+		$callable();
+		echo 'this will never happen';
+	}
+
+	public function sayIIFE(): void
+	{
+		(function (): never {
+			exit();
+		})();
+
+		echo 'this will never happen';
+	}
+
 	function neverReturnsMethod(): never {
 		exit();
 	}
+
+	public function doFoo() {}
+
+	static public function doStaticFoo() {}
 }
 function neverReturns(): never {
 	exit();