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

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -4103,6 +4103,12 @@ private function createConditionalExpressions(
 			if ($mergedExpressionTypes[$exprString]->equalTypes($holder)) {
 				continue;
 			}
+			if (
+				array_key_exists($exprString, $theirExpressionTypes)
+				&& !$theirExpressionTypes[$exprString]->getCertainty()->yes()
+			) {
+				continue;
+			}
 
 			$typeGuards[$exprString] = $holder;
 		}

tests/PHPStan/Analyser/nsrt/conditional-holders-or-assert-isset.php

@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace ConditionalHoldersOrAssertIsset;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @return list<int>
+ */
+function getListOfIds(): array {
+	return [3];
+}
+
+/**
+ * @phpstan-impure
+ */
+function getBool(): bool {
+	return (bool) rand(0, 1);
+}
+
+$displayDetails = getBool();
+$displayList = getBool();
+
+if ($displayList || $displayDetails) {
+	$listOfIds = getListOfIds();
+}
+
+if ($displayList) {
+	assert(isset($listOfIds));
+}
+
+if ($displayDetails) {
+	assert(isset($listOfIds));
+	assertType('bool', $displayList);
+}