Fix conditional bug

phpstan · Nov 28, 2023 · a76b82d · a76b82d
1 parent e5580c5
commit a76b82d
Showing 1 changed file with 21 additions and 1 deletion.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1315,8 +1315,28 @@ private function processBooleanSureConditionalTypes(Scope $scope, SpecifiedTypes
 					$holders[$exprString] = [];
 				}
 
+				$conditions = $conditionExpressionTypes;
+				foreach ($conditions as $conditionExprString => $conditionExprTypeHolder) {
+					$conditionExpr = $conditionExprTypeHolder->getExpr();
+					if (!$conditionExpr instanceof Expr\Variable) {
+						continue;
+					}
+					if (!is_string($conditionExpr->name)) {
+						continue;
+					}
+					if ($conditionExpr->name !== $expr->name) {
+						continue;
+					}
+
+					unset($conditions[$conditionExprString]);
+				}
+
+				if (count($conditions) === 0) {
+					continue;
+				}
+
 				$holder = new ConditionalExpressionHolder(
-					$conditionExpressionTypes,
+					$conditions,
 					new ExpressionTypeHolder($expr, TypeCombinator::intersect($scope->getType($expr), $type), TrinaryLogic::createYes()),
 				);
 				$holders[$exprString][$holder->getKey()] = $holder;