handle variadic

vimeo · Oct 22, 2022 · edeff14 · edeff14
1 parent 2c47d06
commit edeff14
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php b/src/Psalm/Internal/Type/Comparator/UnionTypeComparator.php
@@ -144,11 +144,16 @@ public static function isContainedBy(
                     && is_array($container_type_part->params)
                     && $input_type_part instanceof TCallable
                 ) {
+                    $container_all_param_count = count($container_type_part->params);
                     $container_required_param_count = 0;
                     foreach ($container_type_part->params as $index => $container_param) {
                         if ($container_param->is_optional === false) {
                             $container_required_param_count = $index + 1;
                         }
+
+                        if ($container_param->is_variadic === true) {
+                            $container_all_param_count = PHP_INT_MAX;
+                        }
                     }
 
                     $input_required_param_count = 0;
@@ -161,12 +166,16 @@ public static function isContainedBy(
                             if ($input_param->is_optional === false) {
                                 $input_required_param_count = $index + 1;
                             }
+
+                            if ($input_param->is_variadic === true) {
+                                $input_all_param_count = PHP_INT_MAX;
+                            }
                         }
                     }
 
                     // too few or too many non-optional params provided in callback
                     if ($container_required_param_count > $input_all_param_count
-                        || count($container_type_part->params) < $input_required_param_count
+                        || $container_all_param_count < $input_required_param_count
                     ) {
                         return false;
                     }