Merge branch refs/heads/2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/TypeSpecifier.php

@@ -1119,14 +1119,20 @@ public function specifyTypesInCondition(
 			return $this->specifyTypesInCondition($scope, $expr->expr, $context)->setRootExpr($expr);
 		} elseif (
 			$expr instanceof Expr\Ternary
-			&& !$context->null()
 			&& !$expr->cond instanceof Expr\Ternary
+			&& !$context->null()
 		) {
-			$ifExpr = $expr->if ?? $expr->cond;
-			$conditionExpr = new BooleanOr(
-				new BooleanAnd($expr->cond, $ifExpr),
-				new BooleanAnd(new Expr\BooleanNot($expr->cond), $expr->else),
-			);
+			if ($expr->if !== null) {
+				$conditionExpr = new BooleanOr(
+					new BooleanAnd($expr->cond, $expr->if),
+					new BooleanAnd(new Expr\BooleanNot($expr->cond), $expr->else),
+				);
+			} else {
+				$conditionExpr = new BooleanOr(
+					$expr->cond,
+					new BooleanAnd(new Expr\BooleanNot($expr->cond), $expr->else),
+				);
+			}
 
 			return $this->specifyTypesInCondition($scope, $conditionExpr, $context)->setRootExpr($expr);