Skip non-discriminating guards in createConditionalExpressions even when target is not tracked in the other scope (#5676)

Co-authored-by: VincentLanglet <9052536+VincentLanglet@users.noreply.github.com>

Author: phpstan-bot

src/Analyser/MutatingScope.php

@@ -3749,11 +3749,16 @@ private function createConditionalExpressions(
 
 			foreach ($variableTypeGuards as $guardExprString => $guardHolder) {
 				if (
-					array_key_exists($exprString, $theirExpressionTypes)
-					&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
-					&& array_key_exists($guardExprString, $theirExpressionTypes)
+					array_key_exists($guardExprString, $theirExpressionTypes)
 					&& $theirExpressionTypes[$guardExprString]->getCertainty()->yes()
-					&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
+					&& (
+						(
+							array_key_exists($exprString, $theirExpressionTypes)
+							&& $theirExpressionTypes[$exprString]->getCertainty()->yes()
+							&& !$guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->no()
+						)
+						|| $guardHolder->getType()->isSuperTypeOf($theirExpressionTypes[$guardExprString]->getType())->yes()
+					)
 				) {
 					continue;
 				}

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

@@ -0,0 +1,45 @@
+<?php
+
+namespace Bug14595;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array{
+ *     multiple: 0|1|2
+ *   , total: bool
+ *  } $options
+ */
+function arrayAppendGuard(array $options): void {
+	$instructions = [ ];
+	$instructions[] = "foo";
+	if ($options['multiple'] != 1 || $options['total'])
+		$instructions[] = "bar";
+	assertType('0|1|2', $options['multiple']);
+	if (!$options['total'])
+		$instructions[] = "baz";
+	assertType('0|1|2', $options['multiple']);
+	if (!$options['total'])
+		$instructions[] = "qux";
+	assertType('0|1|2', $options['multiple']);
+}
+
+/**
+ * @param array{
+ *     multiple: 0|1|2
+ *   , total: bool
+ *  } $options
+ */
+function strictComparisonGuard(array $options): void {
+	$instructions = [ ];
+	$instructions[] = "foo";
+	if ($options['multiple'] !== 1 || $options['total'])
+		$instructions[] = "bar";
+	assertType('0|1|2', $options['multiple']);
+	if (!$options['total'])
+		$instructions[] = "baz";
+	assertType('0|1|2', $options['multiple']);
+	if (!$options['total'])
+		$instructions[] = "qux";
+	assertType('0|1|2', $options['multiple']);
+}