chore: backport counting fix

Signed-off-by: azjezz <azjezz@protonmail.com>
php-standard-library · Feb 27, 2022 · 134176c · 134176c
1 parent 294e1cb
commit 134176c
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/EventHandler/Iter/Count/FunctionReturnTypeProvider.php b/src/EventHandler/Iter/Count/FunctionReturnTypeProvider.php
@@ -54,24 +54,29 @@ public static function getFunctionReturnType(FunctionReturnTypeProviderEvent $ev
             return Type::getInt(false, $count);
         }
 
-        // array{foo: bar} -> literal-int(1)
+        // array{foo: bar} -> int<1, max>
+        // array{foo, bar, baz} -> int<3, max>
         if ($array_argument_type instanceof Type\Atomic\TKeyedArray) {
             // Psalm allows extra properties in keyed arrays, so we can't return a literal integer
-            // for this.
-            //
-            // return Type::getInt(false, count($array_argument_type->properties));
-
-            if (count($array_argument_type->properties) >= 1) {
-                return new Type\Union([new Type\Atomic\TIntRange(1, null)]);
+            if (($size = count($array_argument_type->properties)) >= 1) {
+                return new Type\Union([new Type\Atomic\TIntRange($size, null)]);
             }
 
             return Type::getInt();
         }
 
         if ($array_argument_type instanceof Type\Atomic\TArray) {
-            if ($array_argument_type->type_params[0]->isNever() && $array_argument_type->type_params[1]->isNever()) {
+            if (method_exists($array_argument_type, 'isEmptyArray') && $array_argument_type->isEmptyArray()) {
                 return Type::getInt(false, 0);
             }
+
+            if (method_exists($array_argument_type->type_params[0], 'isEmpty')) {
+                if ($array_argument_type->type_params[0]->isEmpty()) {
+                    if ($array_argument_type->type_params[1]->isEmpty()) {
+                        return Type::getInt(false, 0);
+                    }
+                }
+            }
         }
 
         return Type::getInt();