From a5c5252519e1d14b03d3831ce2c1772264235ca8 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Thu, 2 Apr 2026 11:00:07 +0200
Subject: [PATCH 1/2] add failling test

---
 tests/PHPStan/Analyser/nsrt/pr-5379.php | 38 +++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 tests/PHPStan/Analyser/nsrt/pr-5379.php

diff --git a/tests/PHPStan/Analyser/nsrt/pr-5379.php b/tests/PHPStan/Analyser/nsrt/pr-5379.php
new file mode 100644
index 00000000000..0e3bf4ed4cc
--- /dev/null
+++ b/tests/PHPStan/Analyser/nsrt/pr-5379.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PR5379;
+
+use function PHPStan\Testing\assertType;
+
+class AggregationParser
+{
+	/**
+	 * @param array<string, mixed> $aggregation
+	 */
+	private function parseAggregation(array $aggregation)
+	{
+		$type = $aggregation['type'] ?? null;
+		if (!\is_string($type) || empty($type) || is_numeric($type)) {
+			return null;
+		}
+
+		if (empty($aggregation['field']) && $type !== 'filter') {
+			return null;
+		}
+
+		$field = '';
+		if ($type !== 'filter') {
+			$field = self::buildFieldName();
+		}
+
+		assertType('non-empty-string', $type);
+	}
+
+	private static function buildFieldName(): string
+	{
+		return 'field';
+	}
+}
+

From d0467057a39e3502cddcf4eaa767b1908ac04338 Mon Sep 17 00:00:00 2001
From: Vincent Langlet <vincentlanglet@hotmail.fr>
Date: Sat, 11 Apr 2026 16:04:43 +0200
Subject: [PATCH 2/2] Fix

---
 tests/PHPStan/Analyser/nsrt/pr-5379.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/PHPStan/Analyser/nsrt/pr-5379.php b/tests/PHPStan/Analyser/nsrt/pr-5379.php
index 0e3bf4ed4cc..e3f9a47efac 100644
--- a/tests/PHPStan/Analyser/nsrt/pr-5379.php
+++ b/tests/PHPStan/Analyser/nsrt/pr-5379.php
@@ -27,7 +27,7 @@ private function parseAggregation(array $aggregation)
 			$field = self::buildFieldName();
 		}
 
-		assertType('non-empty-string', $type);
+		assertType('non-falsy-string', $type);
 	}
 
 	private static function buildFieldName(): string
@@ -35,4 +35,3 @@ private static function buildFieldName(): string
 		return 'field';
 	}
 }
-