Fix forgetting expressions on function calls / closure invoke

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -2597,6 +2597,16 @@ static function (): void {
 				$throwPoints[] = ThrowPoint::createImplicit($scope, $expr);
 			}
 
+			if (
+				(
+					($functionReflection !== null && $functionReflection->hasSideEffects()->yes())
+					|| $parametersAcceptor instanceof ClosureType && $parametersAcceptor->getReturnType()->isVoid()->yes()
+				)
+				&& $scope->isInClass()
+			) {
+				$scope = $scope->invalidateExpression(new Variable('this'), true);
+			}
+
 			if (
 				$functionReflection !== null
 				&& in_array($functionReflection->getName(), ['json_encode', 'json_decode'], true)
@@ -3022,13 +3032,11 @@ static function (): void {
 
 			if (
 				$methodReflection !== null
-				&& !$methodReflection->isStatic()
 				&& (
 					$methodReflection->hasSideEffects()->yes()
 					|| $methodReflection->getName() === '__construct'
 				)
 				&& $scopeFunction instanceof MethodReflection
-				&& !$scopeFunction->isStatic()
 				&& $scope->isInClass()
 				&& $scope->getClassReflection()->is($methodReflection->getDeclaringClass()->getName())
 			) {

tests/PHPStan/Rules/Methods/NullsafeMethodCallRuleTest.php

@@ -55,4 +55,14 @@ public function testBug6922b(): void
 		$this->analyse([__DIR__ . '/data/bug-6922b.php'], []);
 	}
 
+	public function testBug8523(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8523.php'], []);
+	}
+
+	public function testBug8523b(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-8523b.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Methods/data/bug-8523.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Bug8523;
+
+class HelloWorld
+{
+	public static ?HelloWorld $instance = null;
+
+	public static function bazz(): void
+	{
+		self::$instance = null;
+	}
+
+	public function foo(): void
+	{
+		self::$instance = new HelloWorld();
+
+		self::bazz();
+
+		self::$instance?->foo();
+	}
+
+	public function bar(): void
+	{
+		self::$instance = null;
+	}
+
+	public function baz(): void
+	{
+		self::$instance = new HelloWorld();
+
+		$this->bar();
+
+		self::$instance?->foo();
+	}
+}

tests/PHPStan/Rules/Methods/data/bug-8523b.php

@@ -0,0 +1,24 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8523b;
+
+class HelloWorld
+{
+	public static ?HelloWorld $instance = null;
+
+	public function save(): void {
+		self::$instance = new HelloWorld();
+
+		$callback = static function(): void {
+			self::$instance = null;
+		};
+
+		$callback();
+
+		var_dump(self::$instance);
+
+		self::$instance?->save();
+	}
+}
+
+(new HelloWorld())->save();