fix determination of final scope

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -795,7 +795,35 @@ private function processStmtNode(
 				), $methodScope);
 
 				if ($isConstructor && $this->narrowMethodScopeFromConstructor) {
-					$scope = $statementResult->getScope()->rememberConstructorScope();
+					$finalScope = null;
+
+					foreach ($executionEnds as $executionEnd) {
+						if ($executionEnd->getStatementResult()->isAlwaysTerminating()) {
+							continue;
+						}
+
+						$endScope = $executionEnd->getStatementResult()->getScope();
+						if ($finalScope === null) {
+							$finalScope = $endScope;
+							continue;
+						}
+
+						$finalScope = $finalScope->mergeWith($endScope);
+					}
+
+					foreach ($gatheredReturnStatements as $statement) {
+						if ($finalScope === null) {
+							$finalScope = $statement->getScope();
+							continue;
+						}
+
+						$finalScope = $finalScope->mergeWith($statement->getScope());
+					}
+
+					if ($finalScope !== null) {
+						$scope = $finalScope->rememberConstructorScope();
+					}
+
 				}
 			}
 		} elseif ($stmt instanceof Echo_) {

tests/PHPStan/Analyser/nsrt/remember-readonly-constructor-narrowed.php

@@ -83,3 +83,27 @@ public function doFoo() {
 		assertType('int', $this->i);
 	}
 }
+
+class HelloWorldReadonlyPropertySometimesThrowing {
+	private readonly int $i;
+
+	public function __construct()
+	{
+		if (rand(0,1)) {
+			$this->i = 4;
+
+			return;
+		} elseif (rand(10,100)) {
+			$this->i = 10;
+			return;
+		} else {
+			$this->i = 20;
+		}
+
+		throw new \LogicException();
+	}
+
+	public function doFoo() {
+		assertType('4|10', $this->i);
+	}
+}