fix inference with smaller/smaller equal on recursive count()

phpstan · Dec 8, 2023 · 39554a3 · 39554a3
1 parent ee52ac4
commit 39554a3
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 1 deletion.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -208,7 +208,7 @@ public function specifyTypesInCondition(
 
  if (
  $expr->left instanceof FuncCall
- && count($expr->left->getArgs()) === 1
+ && count($expr->left->getArgs()) >= 1
  && $expr->left->name instanceof Name
  && in_array(strtolower((string) $expr->left->name), ['count', 'sizeof', 'strlen'], true)
  && (

diff --git a/tests/PHPStan/Analyser/data/minmax-arrays.php b/tests/PHPStan/Analyser/data/minmax-arrays.php
@@ -125,3 +125,24 @@ public function unionType(): void
  assertType('9', max([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]));
  }
 }
+
+/**
+ * @param int[] $ints
+ */
+function countRecursive(array $ints): void
+{
+ if (count($ints, COUNT_RECURSIVE) <= 0) {
+ assertType('false', min($ints));
+ assertType('false', max($ints));
+ } else {
+ assertType('int', min($ints));
+ assertType('int', max($ints));
+ }
+ if (count($ints, COUNT_RECURSIVE) < 1) {
+ assertType('false', min($ints));
+ assertType('false', max($ints));
+ } else {
+ assertType('int', min($ints));
+ assertType('int', max($ints));
+ }
+}
diff --git a/tests/PHPStan/Analyser/data/minmax-php8.php b/tests/PHPStan/Analyser/data/minmax-php8.php
@@ -126,3 +126,24 @@ public function unionType(): void
  assertType('9', max([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]));
  }
 }
+
+/**
+ * @param int[] $ints
+ */
+function countRecursive(array $ints): void
+{
+ if (count($ints, COUNT_RECURSIVE) < 1) {
+ assertType('*ERROR*', min($ints));
+ assertType('*ERROR*', max($ints));
+ } else {
+ assertType('int', min($ints));
+ assertType('int', max($ints));
+ }
+ if (count($ints, COUNT_RECURSIVE) < 2) {
+ assertType('int', min($ints));
+ assertType('int', max($ints));
+ } else {
+ assertType('int', min($ints));
+ assertType('int', max($ints));
+ }
+}