Rollback some changes

vimeo · Oct 17, 2023 · 0f8a320 · 0f8a320
1 parent 889bdca
commit 0f8a320
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Psalm/Internal/Type/SimpleAssertionReconciler.php b/src/Psalm/Internal/Type/SimpleAssertionReconciler.php
@@ -2650,6 +2650,10 @@ private static function reconcileCallable(
             ) {
                 $callable_types[] = $type;
                 $redundant = false;
+            } elseif ($type instanceof TArray) {
+                $type = new TCallableKeyedArray($type->type_params);
+                $callable_types[] = $type;
+                $redundant = false;
             } elseif ($type instanceof TKeyedArray && count($type->properties) === 2) {
                 $type = new TCallableKeyedArray($type->properties);
                 $callable_types[] = $type;

diff --git a/src/Psalm/Internal/Type/TypeParser.php b/src/Psalm/Internal/Type/TypeParser.php
@@ -1411,6 +1411,7 @@ private static function getTypeFromKeyedArrayTree(
                         !is_numeric($property_key)
                         || ($had_optional && !$property_maybe_undefined)
                         || $type === 'array'
+                        || $type === 'callable-array'
                         || $previous_property_key != ($property_key - 1)
                     )
                 ) {