Understand that methods called from constructor throwing exception cannot leave object in an uninitializad state

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -2185,13 +2185,31 @@ function (MutatingScope $scope) use ($expr, $nodeCallback, $context): Expression
 						$calledMethodEndScope = null;
 						foreach ($executionEnds as $executionEnd) {
 							$statementResult = $executionEnd->getStatementResult();
+							$endNode = $executionEnd->getNode();
+							if ($endNode instanceof Node\Stmt\Throw_) {
+								continue;
+							}
+							if ($endNode instanceof Node\Stmt\Expression) {
+								$exprType = $statementResult->getScope()->getType($endNode->expr);
+								if ($exprType instanceof NeverType && $exprType->isExplicit()) {
+									continue;
+								}
+							}
 							if ($calledMethodEndScope === null) {
 								$calledMethodEndScope = $statementResult->getScope();
 								continue;
 							}
 
 							$calledMethodEndScope = $calledMethodEndScope->mergeWith($statementResult->getScope());
 						}
+						foreach ($methodReturnStatementsNode->getReturnStatements() as $returnStatement) {
+							if ($calledMethodEndScope === null) {
+								$calledMethodEndScope = $returnStatement->getScope();
+								continue;
+							}
+
+							$calledMethodEndScope = $calledMethodEndScope->mergeWith($returnStatement->getScope());
+						}
 
 						if ($calledMethodEndScope !== null) {
 							$scope = $scope->mergeInitializedProperties($calledMethodEndScope);

tests/PHPStan/Rules/Properties/data/uninitialized-property.php

@@ -406,3 +406,67 @@ private function returnNever()
 	}
 
 }
+
+class InitializedInPrivateSetterWithThrow
+{
+
+	private int $foo;
+
+	public function __construct()
+	{
+		$this->setFoo();
+		$this->doSomething();
+	}
+
+	private function setFoo()
+	{
+		if (rand(0, 1)) {
+			$this->foo = 1;
+			return;
+		}
+
+		throw new \Exception();
+	}
+
+	public function doSomething()
+	{
+		echo $this->foo;
+	}
+
+}
+
+class InitializedInPrivateSetterWithReturnNever
+{
+
+	private int $foo;
+
+	public function __construct()
+	{
+		$this->setFoo();
+		$this->doSomething();
+	}
+
+	private function setFoo()
+	{
+		if (rand(0, 1)) {
+			$this->foo = 1;
+			return;
+		}
+
+		$this->returnNever();
+	}
+
+	public function doSomething()
+	{
+		echo $this->foo;
+	}
+
+	/**
+	 * @return never
+	 */
+	private function returnNever()
+	{
+		throw new \Exception();
+	}
+
+}