Merge pull request #9362 from othercorey/drop-associative-array

Convert callmap associative-array types into proper array types
vimeo · Feb 23, 2023 · 4062214 · 4062214
2 parents b7646d9 + 4e46706
commit 4062214
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 78 deletions.
diff --git a/dictionaries/CallMap.php b/dictionaries/CallMap.php
@@ -359,29 +359,29 @@
 'ArithmeticError::getPrevious' => ['?Throwable'],
 'ArithmeticError::getTrace' => ['list<array{file?:string,line?:int,function:string,class?:class-string,type?:\'::\'|\'->\',args?:array<mixed>}>'],
 'ArithmeticError::getTraceAsString' => ['string'],
-'array_change_key_case' => ['associative-array', 'array'=>'array', 'case='=>'int'],
+'array_change_key_case' => ['array', 'array'=>'array', 'case='=>'int'],
 'array_chunk' => ['list<array[]>', 'array'=>'array', 'length'=>'int', 'preserve_keys='=>'bool'],
 'array_column' => ['array', 'array'=>'array', 'column_key'=>'int|string|null', 'index_key='=>'int|string|null'],
-'array_combine' => ['associative-array', 'keys'=>'string[]|int[]', 'values'=>'array'],
-'array_count_values' => ['associative-array<mixed,int>', 'array'=>'array'],
-'array_diff' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_diff_assoc' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_diff_key' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_diff_uassoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int'],
-'array_diff_uassoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_diff_ukey' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'key_comp_func'=>'callable(mixed,mixed):int'],
-'array_diff_ukey\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_combine' => ['array', 'keys'=>'string[]|int[]', 'values'=>'array'],
+'array_count_values' => ['array<int>', 'array'=>'array<string|int>'],
+'array_diff' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_diff_assoc' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_diff_key' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_diff_uassoc' => ['array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int'],
+'array_diff_uassoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_diff_ukey' => ['array', 'array'=>'array', 'rest'=>'array', 'key_comp_func'=>'callable(mixed,mixed):int'],
+'array_diff_ukey\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
 'array_fill' => ['array<int,mixed>', 'start_index'=>'int', 'count'=>'int', 'value'=>'mixed'],
 'array_fill_keys' => ['array', 'keys'=>'array', 'value'=>'mixed'],
-'array_filter' => ['associative-array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
-'array_flip' => ['associative-array<mixed,int>|associative-array<mixed,string>', 'array'=>'array'],
-'array_intersect' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_intersect_assoc' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_intersect_key' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
-'array_intersect_uassoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'key_compare_func'=>'callable(mixed,mixed):int'],
-'array_intersect_uassoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest'=>'array|callable(mixed,mixed):int'],
-'array_intersect_ukey' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'key_compare_func'=>'callable(mixed,mixed):int'],
-'array_intersect_ukey\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest'=>'array|callable(mixed,mixed):int'],
+'array_filter' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
+'array_flip' => ['array<string|int>', 'array'=>'array<string|int>'],
+'array_intersect' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_intersect_assoc' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_intersect_key' => ['array', 'array'=>'array', '...arrays='=>'array'],
+'array_intersect_uassoc' => ['array', 'array'=>'array', 'rest'=>'array', 'key_compare_func'=>'callable(mixed,mixed):int'],
+'array_intersect_uassoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest'=>'array|callable(mixed,mixed):int'],
+'array_intersect_ukey' => ['array', 'array'=>'array', 'rest'=>'array', 'key_compare_func'=>'callable(mixed,mixed):int'],
+'array_intersect_ukey\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest'=>'array|callable(mixed,mixed):int'],
 'array_is_list' => ['bool', 'array'=>'array'],
 'array_key_exists' => ['bool', 'key'=>'string|int', 'array'=>'array'],
 'array_key_first' => ['int|string|null', 'array'=>'array'],
@@ -406,18 +406,18 @@
 'array_slice' => ['array', 'array'=>'array', 'offset'=>'int', 'length='=>'?int', 'preserve_keys='=>'bool'],
 'array_splice' => ['array', '&rw_array'=>'array', 'offset'=>'int', 'length='=>'?int', 'replacement='=>'array|string'],
 'array_sum' => ['int|float', 'array'=>'array'],
-'array_udiff' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int'],
-'array_udiff\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_udiff_assoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'key_comp_func'=>'callable(mixed,mixed):int'],
-'array_udiff_assoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_udiff_uassoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int', 'key_comp_func'=>'callable(mixed,mixed):int'],
-'array_udiff_uassoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', 'arg5'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_uintersect' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int'],
-'array_uintersect\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_uintersect_assoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int'],
-'array_uintersect_assoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable', '...rest='=>'array|callable(mixed,mixed):int'],
-'array_uintersect_uassoc' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int', 'key_compare_func'=>'callable(mixed,mixed):int'],
-'array_uintersect_uassoc\'1' => ['associative-array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', 'arg5'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_udiff' => ['array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int'],
+'array_udiff\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_udiff_assoc' => ['array', 'array'=>'array', 'rest'=>'array', 'key_comp_func'=>'callable(mixed,mixed):int'],
+'array_udiff_assoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_udiff_uassoc' => ['array', 'array'=>'array', 'rest'=>'array', 'data_comp_func'=>'callable(mixed,mixed):int', 'key_comp_func'=>'callable(mixed,mixed):int'],
+'array_udiff_uassoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', 'arg5'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_uintersect' => ['array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int'],
+'array_uintersect\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_uintersect_assoc' => ['array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int'],
+'array_uintersect_assoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable', '...rest='=>'array|callable(mixed,mixed):int'],
+'array_uintersect_uassoc' => ['array', 'array'=>'array', 'rest'=>'array', 'data_compare_func'=>'callable(mixed,mixed):int', 'key_compare_func'=>'callable(mixed,mixed):int'],
+'array_uintersect_uassoc\'1' => ['array', 'array'=>'array', 'rest'=>'array', 'arr3'=>'array', 'arg4'=>'array|callable(mixed,mixed):int', 'arg5'=>'array|callable(mixed,mixed):int', '...rest='=>'array|callable(mixed,mixed):int'],
 'array_unique' => ['array', 'array'=>'array', 'flags='=>'0'],
 'array_unique\'1' => ['array<int|float|string|null>', 'array'=>'array<int|float|string|null>', 'flags='=>'1'],
 'array_unique\'2' => ['array<int|float|string|bool|\Stringable|null>', 'array'=>'array<int|float|string|bool|\Stringable|null>', 'flags='=>'2|5'],

diff --git a/dictionaries/CallMap_80_delta.php b/dictionaries/CallMap_80_delta.php
@@ -390,40 +390,40 @@
       'new' => ['array', 'array'=>'array', 'column_key'=>'int|string|null', 'index_key='=>'int|string|null'],
     ],
     'array_combine' => [
-      'old' => ['associative-array|false', 'keys'=>'string[]|int[]', 'values'=>'array'],
-      'new' => ['associative-array', 'keys'=>'string[]|int[]', 'values'=>'array'],
+      'old' => ['array|false', 'keys'=>'string[]|int[]', 'values'=>'array'],
+      'new' => ['array', 'keys'=>'string[]|int[]', 'values'=>'array'],
     ],
     'array_diff' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_diff_assoc' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_diff_key' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_filter' => [
-      'old' => ['associative-array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar', 'mode='=>'int'],
-      'new' => ['associative-array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
+      'old' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar', 'mode='=>'int'],
+      'new' => ['array', 'array'=>'array', 'callback='=>'callable(mixed,mixed=):scalar|null', 'mode='=>'int'],
     ],
     'array_key_exists' => [
       'old' => ['bool', 'key'=>'string|int', 'array'=>'array|object'],
       'new' => ['bool', 'key'=>'string|int', 'array'=>'array'],
     ],
     'array_intersect' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_intersect_assoc' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_intersect_key' => [
-      'old' => ['associative-array', 'array'=>'array', '...arrays'=>'array'],
-      'new' => ['associative-array', 'array'=>'array', '...arrays='=>'array'],
+      'old' => ['array', 'array'=>'array', '...arrays'=>'array'],
+      'new' => ['array', 'array'=>'array', '...arrays='=>'array'],
     ],
     'array_splice' => [
       'old' => ['array', '&rw_array'=>'array', 'offset'=>'int', 'length='=>'int', 'replacement='=>'array|string'],