Merge branch 2.1.x into 2.2.x

Author: phpstan-bot

src/Analyser/TypeSpecifier.php

@@ -1939,9 +1939,15 @@ private function processBooleanSureConditionalTypes(Scope $scope, SpecifiedTypes
 				continue;
 			}
 
+			$scopeType = $scope->getType($expr);
+			$conditionType = TypeCombinator::remove($scopeType, $type);
+			if ($scopeType->equals($conditionType)) {
+				continue;
+			}
+
 			$conditionExpressionTypes[$exprString] = ExpressionTypeHolder::createYes(
 				$expr,
-				TypeCombinator::remove($scope->getType($expr), $type),
+				$conditionType,
 			);
 		}
 

tests/PHPStan/Analyser/nsrt/pr-5445.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace BugPr5445;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<string, mixed> $aggregation
+ * @param non-falsy-string $type
+ */
+function testTriviallyTrueConditionSkipped(array $aggregation, string $type): void
+{
+	if (empty($aggregation['field']) && $type !== 'filter') {
+		return;
+	}
+
+	assertType("array<string, mixed>", $aggregation);
+	assertType('non-falsy-string', $type);
+
+	if ($type !== 'filter') {
+		assertType("array<string, mixed>", $aggregation);
+	}
+
+	assertType('non-falsy-string', $type);
+}