Fix execution branch confusion

Co-authored-by: Markus Staab <markus.staab@redaxo.de>

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -4141,17 +4141,21 @@ private function createConditionalExpressions(
 				continue;
 			}
 
-			$conditionalExpression = new ConditionalExpressionHolder($variableTypeGuards, $holder);
-			$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			foreach ($variableTypeGuards as $guardExprString => $guardHolder) {
+				$conditionalExpression = new ConditionalExpressionHolder([$guardExprString => $guardHolder], $holder);
+				$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			}
 		}
 
 		foreach ($mergedExpressionTypes as $exprString => $mergedExprTypeHolder) {
 			if (array_key_exists($exprString, $ourExpressionTypes)) {
 				continue;
 			}
 
-			$conditionalExpression = new ConditionalExpressionHolder($typeGuards, new ExpressionTypeHolder($mergedExprTypeHolder->getExpr(), new ErrorType(), TrinaryLogic::createNo()));
-			$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			foreach ($typeGuards as $guardExprString => $guardHolder) {
+				$conditionalExpression = new ConditionalExpressionHolder([$guardExprString => $guardHolder], new ExpressionTypeHolder($mergedExprTypeHolder->getExpr(), new ErrorType(), TrinaryLogic::createNo()));
+				$conditionalExpressions[$exprString][$conditionalExpression->getKey()] = $conditionalExpression;
+			}
 		}
 
 		return $conditionalExpressions;

tests/PHPStan/Analyser/nsrt/bug-5051.php

@@ -0,0 +1,127 @@
+<?php declare(strict_types = 1);
+
+namespace Bug5051;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public function test(?object $data): void
+	{
+		if ($data === null) {
+			$foo = 'bar';
+			$update = false;
+		} else {
+			$foo = 'baz';
+			$update = true;
+		}
+
+		assertType('object|null', $data);
+		assertType("'bar'|'baz'", $foo);
+
+		if ($update) {
+			assertType('object', $data);
+			assertType("'baz'", $foo);
+		} else {
+			assertType('null', $data);
+			assertType("'bar'", $foo);
+		}
+		assertType('object|null', $data);
+		assertType("'bar'|'baz'", $foo);
+	}
+
+	/**
+	 * @param 1|2|3|10 $data
+	 */
+	public function testWithBooleans($data): void
+	{
+		$foo = 1;
+		if ($data === 1 || $data === 2) {
+			$update = false;
+			$foo = false;
+		} elseif ($data === 3) {
+			$update = false;
+			$foo = true;
+		} else {
+			$update = true;
+			$foo = true;
+		}
+
+		if ($update) {
+			assertType('10', $data);
+			assertType('bool', $foo);
+		} else {
+			assertType('1|2|3', $data);
+			assertType('bool', $foo);
+		}
+
+		if ($foo) {
+			assertType('1|2|3|10', $data);
+			assertType('bool', $update);
+		} else {
+			assertType('1|2|3|10', $data);
+			assertType('bool', $update);
+		}
+
+		if ($data === 1) {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		} else {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		}
+
+		if ($data === 2) {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		} else {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		}
+
+		if ($data === 3) {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		} else {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		}
+
+		if ($data === 1 || $data === 2) {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		} else {
+			assertType('bool', $update);
+			assertType('bool', $foo);
+		}
+
+	}
+
+	public function testWithDifferentVariableNames(?object $data): void
+	{
+		if ($data === null) {
+			$update = false;
+			$foo = 'bar';
+		} else {
+			$update = true;
+			$fuu = 'baz';
+		}
+
+		if ($update) {
+			assertType('object', $data);
+		}
+	}
+
+	public function testWithoutExtraAssignment(?object $data): void
+	{
+		if ($data === null) {
+			$update = false;
+		} else {
+			$update = true;
+		}
+
+		if ($update) {
+			assertType('object', $data);
+		}
+	}
+}

tests/PHPStan/Analyser/nsrt/bug-5058.php

@@ -0,0 +1,33 @@
+<?php // lint >= 8.0
+
+namespace Bug5058;
+
+use function PHPStan\Testing\assertType;
+
+class test{
+
+	private string $properString;
+
+	public function doSomething(mixed $string): void
+	{
+
+		$errors = [];
+		if(is_string($string) === false){
+			$errors['string'] = 'fail';
+		}
+
+		assertType('mixed', $string);
+		if(empty($errors) === false){
+			throw new Exception('Epic fail');
+		}
+
+		assertType('string', $string);
+		$this->properString = $string;
+	}
+
+	public function getProperString(): string
+	{
+		return $this->properString;
+	}
+
+}