Conditional expressions - do not take conclusions about identical variable in assignment

Author: ondrejmirtes

src/Analyser/NodeScopeResolver.php

@@ -3795,6 +3795,10 @@ private function processSureTypesForConditionalExpressionsAfterAssign(Scope $sco
 				continue;
 			}
 
+			if ($expr->name === $variableName) {
+				continue;
+			}
+
 			if (!isset($conditionalExpressions[$exprString])) {
 				$conditionalExpressions[$exprString] = [];
 			}
@@ -3825,6 +3829,10 @@ private function processSureNotTypesForConditionalExpressionsAfterAssign(Scope $
 				continue;
 			}
 
+			if ($expr->name === $variableName) {
+				continue;
+			}
+
 			if (!isset($conditionalExpressions[$exprString])) {
 				$conditionalExpressions[$exprString] = [];
 			}

tests/PHPStan/Analyser/NodeScopeResolverTest.php

@@ -1157,6 +1157,8 @@ public function dataFileAsserts(): iterable
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8568.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/../Rules/DeadCode/data/bug-8620.php');
 		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8635.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8625.php');
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/bug-8621.php');
 	}
 
 	/**

tests/PHPStan/Analyser/data/bug-8621.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Bug8621;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	/**
+	 * @param array<string> $data
+	 */
+	public function rows (array $data): void
+	{
+		$even = true;
+
+		echo "<table>";
+		foreach ($data as $datum)
+		{
+			$even = !$even;
+			assertType('bool', $even);
+
+			echo "<tr class='" . ($even ? 'even' :'odd') . "'>";
+			echo "<td>{$datum}</td></tr>";
+		}
+		echo "</table>";
+	}
+}

tests/PHPStan/Analyser/data/bug-8625.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Bug8625;
+
+use function PHPStan\Testing\assertType;
+
+class HelloWorld
+{
+	public static function sayHello(): void
+	{
+		$key = false;
+		$loopArray = [1, 2, 3];
+		foreach ($loopArray as $i) {
+			$key = $key === false;
+			assertType('bool', $key);
+			if ($key) {
+				echo "i=$i key is true\n";
+			} else {
+				echo "i=$i key is false\n";
+			}
+		}
+	}
+}