From 540d6a2e544ca9b7836da3a17a8fabda851b0ad7 Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sat, 22 Mar 2025 09:52:19 +0100
Subject: [PATCH 1/2] Fix `count()` regression

---
 src/Analyser/TypeSpecifier.php                |  2 +-
 .../Analyser/nsrt/count-const-array.php       | 78 +++++++++++++++++++
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 tests/PHPStan/Analyser/nsrt/count-const-array.php

diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
index 105204cee7..12a9348f5e 100644
--- a/src/Analyser/TypeSpecifier.php
+++ b/src/Analyser/TypeSpecifier.php
@@ -1063,7 +1063,7 @@ private function specifyTypesForCountFuncCall(
 
 		$isConstantArray = $type->isConstantArray();
 		$isList = $type->isList();
-		$zeroOrMore = IntegerRangeType::fromInterval(0, null);
+		$zeroOrMore = IntegerRangeType::fromInterval(1, null);
 		if (
 			!$isNormalCount->yes()
 			|| (!$isConstantArray->yes() && !$isList->yes())
diff --git a/tests/PHPStan/Analyser/nsrt/count-const-array.php b/tests/PHPStan/Analyser/nsrt/count-const-array.php
new file mode 100644
index 0000000000..dfcb626150
--- /dev/null
+++ b/tests/PHPStan/Analyser/nsrt/count-const-array.php
@@ -0,0 +1,78 @@
+<?php declare(strict_types = 1);
+
+namespace CountConstArray;
+
+use function PHPStan\debugScope;
+use function PHPStan\dumpType;
+use function PHPStan\Testing\assertType;
+
+final class Foo
+{
+
+	public function sayHello(): void
+	{
+		$expectedDaysResult = [
+			'2019-01-04' => [
+				'17:00',
+				'evening',
+			],
+			'2019-01-05' => [
+				'07:00',
+				'morning',
+			],
+			'2019-01-06' => [
+				'12:00',
+				'afternoon',
+			],
+			'2019-01-07' => [
+				'10:00',
+				'11:00',
+				'12:00',
+				'13:00',
+				'14:00',
+				'15:00',
+				'16:00',
+				'17:00',
+				'morning',
+				'afternoon',
+				'evening',
+			],
+			'2019-01-08' => [
+				'07:00',
+				'08:00',
+				'13:00',
+				'19:00',
+				'morning',
+				'afternoon',
+				'evening',
+			],
+			'anyDay' => [
+				'07:00',
+				'08:00',
+				'10:00',
+				'11:00',
+				'12:00',
+				'13:00',
+				'14:00',
+				'15:00',
+				'16:00',
+				'17:00',
+				'19:00',
+				'morning',
+				'afternoon',
+				'evening',
+			],
+		];
+		$actualEnabledDays = $this->getEnabledDays();
+		assert(count($expectedDaysResult) === count($actualEnabledDays));
+		assertType("array{2019-01-04: array{'17:00', 'evening'}, 2019-01-05: array{'07:00', 'morning'}, 2019-01-06: array{'12:00', 'afternoon'}, 2019-01-07: array{'10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', 'morning', 'afternoon', 'evening'}, 2019-01-08: array{'07:00', '08:00', '13:00', '19:00', 'morning', 'afternoon', 'evening'}, anyDay: array{'07:00', '08:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '19:00', 'morning', 'afternoon', 'evening'}}", $expectedDaysResult);
+	}
+
+	/**
+	 * @return array<string, array<int, string>>
+	 */
+	private function getEnabledDays(): array
+	{
+		return [];
+	}
+}

From dfdad3340ed7b1e98e5c9e54b802b56f6e721a6f Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Sat, 22 Mar 2025 09:57:31 +0100
Subject: [PATCH 2/2] Update TypeSpecifier.php

---
 src/Analyser/TypeSpecifier.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
index 12a9348f5e..33d3c34a7e 100644
--- a/src/Analyser/TypeSpecifier.php
+++ b/src/Analyser/TypeSpecifier.php
@@ -1063,12 +1063,12 @@ private function specifyTypesForCountFuncCall(
 
 		$isConstantArray = $type->isConstantArray();
 		$isList = $type->isList();
-		$zeroOrMore = IntegerRangeType::fromInterval(1, null);
+		$oneOrMore = IntegerRangeType::fromInterval(1, null);
 		if (
 			!$isNormalCount->yes()
 			|| (!$isConstantArray->yes() && !$isList->yes())
 			|| $type->isIterableAtLeastOnce()->no() // array{} cannot be used for further narrowing
-			|| !$zeroOrMore->isSuperTypeOf($sizeType)->yes()
+			|| !$oneOrMore->isSuperTypeOf($sizeType)->yes()
 		) {
 			return null;
 		}