Skip to content

Commit d8cbc21

Browse files
danogdanog
committed
Merge remote-tracking branch 'origin/6.x'
2 parents 6c50177 + 04f312a commit d8cbc21

26 files changed

+363
-96
lines changed

‎bin/gen_callmap.php

+16-2
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,23 @@
150150
if ($version < 80) {
151151
$params = $customMaps[80][$func];
152152
continue;
153-
} else if (!str_ends_with($func, "'1")) {
153+
} elseif (!str_ends_with($func, "'1")) {
154154
unset($params['...rest=']);
155-
$params['...rest'] = 'array<array-key, mixed>|callable(mixed, mixed):int';
155+
unset($params['...rest']);
156+
if (str_starts_with($func, 'array_diff_u')
157+
|| str_starts_with($func, 'array_intersect_u')
158+
) {
159+
$params['...rest'] = "array<array-key, mixed>|callable(string, string):int|".
160+
"callable(int, int):int|callable(array-key, array-key):int";
161+
} elseif ($func === 'array_udiff_uassoc'
162+
|| $func === 'array_uintersect_uassoc') {
163+
$params['arr2'] = "array<array-key, mixed>";
164+
$params['value_compare_func'] = "callable(mixed, mixed):int";
165+
$params['key_compare_func'] = "callable(string, string):int|callable(int, int):int|".
166+
"callable(array-key, array-key):int";
167+
} else {
168+
$params['...rest'] = "array<array-key, mixed>|callable(mixed, mixed):int";
169+
}
156170
}
157171
}
158172
} unset($params);

‎dictionaries/CallMap_70.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1716,7 +1716,7 @@
17161716
array (
17171717
0 => 'array<array-key, mixed>',
17181718
'array' => 'array<array-key, mixed>',
1719-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1719+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17201720
),
17211721
'array_diff_uassoc\'1' =>
17221722
array (
@@ -1731,7 +1731,7 @@
17311731
array (
17321732
0 => 'array<array-key, mixed>',
17331733
'array' => 'array<array-key, mixed>',
1734-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1734+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17351735
),
17361736
'array_diff_ukey\'1' =>
17371737
array (
@@ -1789,7 +1789,7 @@
17891789
array (
17901790
0 => 'array<array-key, mixed>',
17911791
'array' => 'array<array-key, mixed>',
1792-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1792+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17931793
),
17941794
'array_intersect_uassoc\'1' =>
17951795
array (
@@ -1804,7 +1804,7 @@
18041804
array (
18051805
0 => 'array<array-key, mixed>',
18061806
'array' => 'array<array-key, mixed>',
1807-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1807+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18081808
),
18091809
'array_intersect_ukey\'1' =>
18101810
array (
@@ -1980,7 +1980,9 @@
19801980
array (
19811981
0 => 'array<array-key, mixed>',
19821982
'array' => 'array<array-key, mixed>',
1983-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1983+
'arr2' => 'array<array-key, mixed>',
1984+
'value_compare_func' => 'callable(mixed, mixed):int',
1985+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
19841986
),
19851987
'array_udiff_uassoc\'1' =>
19861988
array (
@@ -2026,7 +2028,9 @@
20262028
array (
20272029
0 => 'array<array-key, mixed>',
20282030
'array' => 'array<array-key, mixed>',
2029-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2031+
'arr2' => 'array<array-key, mixed>',
2032+
'value_compare_func' => 'callable(mixed, mixed):int',
2033+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20302034
),
20312035
'array_uintersect_uassoc\'1' =>
20322036
array (

‎dictionaries/CallMap_71.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@
17781778
array (
17791779
0 => 'array<array-key, mixed>',
17801780
'array' => 'array<array-key, mixed>',
1781-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1781+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17821782
),
17831783
'array_diff_uassoc\'1' =>
17841784
array (
@@ -1793,7 +1793,7 @@
17931793
array (
17941794
0 => 'array<array-key, mixed>',
17951795
'array' => 'array<array-key, mixed>',
1796-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1796+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17971797
),
17981798
'array_diff_ukey\'1' =>
17991799
array (
@@ -1851,7 +1851,7 @@
18511851
array (
18521852
0 => 'array<array-key, mixed>',
18531853
'array' => 'array<array-key, mixed>',
1854-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1854+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18551855
),
18561856
'array_intersect_uassoc\'1' =>
18571857
array (
@@ -1866,7 +1866,7 @@
18661866
array (
18671867
0 => 'array<array-key, mixed>',
18681868
'array' => 'array<array-key, mixed>',
1869-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1869+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18701870
),
18711871
'array_intersect_ukey\'1' =>
18721872
array (
@@ -2052,7 +2052,9 @@
20522052
array (
20532053
0 => 'array<array-key, mixed>',
20542054
'array' => 'array<array-key, mixed>',
2055-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2055+
'arr2' => 'array<array-key, mixed>',
2056+
'value_compare_func' => 'callable(mixed, mixed):int',
2057+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20562058
),
20572059
'array_udiff_uassoc\'1' =>
20582060
array (
@@ -2098,7 +2100,9 @@
20982100
array (
20992101
0 => 'array<array-key, mixed>',
21002102
'array' => 'array<array-key, mixed>',
2101-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2103+
'arr2' => 'array<array-key, mixed>',
2104+
'value_compare_func' => 'callable(mixed, mixed):int',
2105+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
21022106
),
21032107
'array_uintersect_uassoc\'1' =>
21042108
array (

‎dictionaries/CallMap_72.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@
17781778
array (
17791779
0 => 'array<array-key, mixed>',
17801780
'array' => 'array<array-key, mixed>',
1781-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1781+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17821782
),
17831783
'array_diff_uassoc\'1' =>
17841784
array (
@@ -1793,7 +1793,7 @@
17931793
array (
17941794
0 => 'array<array-key, mixed>',
17951795
'array' => 'array<array-key, mixed>',
1796-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1796+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17971797
),
17981798
'array_diff_ukey\'1' =>
17991799
array (
@@ -1851,7 +1851,7 @@
18511851
array (
18521852
0 => 'array<array-key, mixed>',
18531853
'array' => 'array<array-key, mixed>',
1854-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1854+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18551855
),
18561856
'array_intersect_uassoc\'1' =>
18571857
array (
@@ -1866,7 +1866,7 @@
18661866
array (
18671867
0 => 'array<array-key, mixed>',
18681868
'array' => 'array<array-key, mixed>',
1869-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1869+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18701870
),
18711871
'array_intersect_ukey\'1' =>
18721872
array (
@@ -2052,7 +2052,9 @@
20522052
array (
20532053
0 => 'array<array-key, mixed>',
20542054
'array' => 'array<array-key, mixed>',
2055-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2055+
'arr2' => 'array<array-key, mixed>',
2056+
'value_compare_func' => 'callable(mixed, mixed):int',
2057+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20562058
),
20572059
'array_udiff_uassoc\'1' =>
20582060
array (
@@ -2098,7 +2100,9 @@
20982100
array (
20992101
0 => 'array<array-key, mixed>',
21002102
'array' => 'array<array-key, mixed>',
2101-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2103+
'arr2' => 'array<array-key, mixed>',
2104+
'value_compare_func' => 'callable(mixed, mixed):int',
2105+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
21022106
),
21032107
'array_uintersect_uassoc\'1' =>
21042108
array (

‎dictionaries/CallMap_73.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1778,7 +1778,7 @@
17781778
array (
17791779
0 => 'array<array-key, mixed>',
17801780
'array' => 'array<array-key, mixed>',
1781-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1781+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17821782
),
17831783
'array_diff_uassoc\'1' =>
17841784
array (
@@ -1793,7 +1793,7 @@
17931793
array (
17941794
0 => 'array<array-key, mixed>',
17951795
'array' => 'array<array-key, mixed>',
1796-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1796+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17971797
),
17981798
'array_diff_ukey\'1' =>
17991799
array (
@@ -1851,7 +1851,7 @@
18511851
array (
18521852
0 => 'array<array-key, mixed>',
18531853
'array' => 'array<array-key, mixed>',
1854-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1854+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18551855
),
18561856
'array_intersect_uassoc\'1' =>
18571857
array (
@@ -1866,7 +1866,7 @@
18661866
array (
18671867
0 => 'array<array-key, mixed>',
18681868
'array' => 'array<array-key, mixed>',
1869-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1869+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18701870
),
18711871
'array_intersect_ukey\'1' =>
18721872
array (
@@ -2052,7 +2052,9 @@
20522052
array (
20532053
0 => 'array<array-key, mixed>',
20542054
'array' => 'array<array-key, mixed>',
2055-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2055+
'arr2' => 'array<array-key, mixed>',
2056+
'value_compare_func' => 'callable(mixed, mixed):int',
2057+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20562058
),
20572059
'array_udiff_uassoc\'1' =>
20582060
array (
@@ -2098,7 +2100,9 @@
20982100
array (
20992101
0 => 'array<array-key, mixed>',
21002102
'array' => 'array<array-key, mixed>',
2101-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2103+
'arr2' => 'array<array-key, mixed>',
2104+
'value_compare_func' => 'callable(mixed, mixed):int',
2105+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
21022106
),
21032107
'array_uintersect_uassoc\'1' =>
21042108
array (

‎dictionaries/CallMap_74.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1809,7 +1809,7 @@
18091809
array (
18101810
0 => 'array<array-key, mixed>',
18111811
'array' => 'array<array-key, mixed>',
1812-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1812+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18131813
),
18141814
'array_diff_uassoc\'1' =>
18151815
array (
@@ -1824,7 +1824,7 @@
18241824
array (
18251825
0 => 'array<array-key, mixed>',
18261826
'array' => 'array<array-key, mixed>',
1827-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1827+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18281828
),
18291829
'array_diff_ukey\'1' =>
18301830
array (
@@ -1882,7 +1882,7 @@
18821882
array (
18831883
0 => 'array<array-key, mixed>',
18841884
'array' => 'array<array-key, mixed>',
1885-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1885+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18861886
),
18871887
'array_intersect_uassoc\'1' =>
18881888
array (
@@ -1897,7 +1897,7 @@
18971897
array (
18981898
0 => 'array<array-key, mixed>',
18991899
'array' => 'array<array-key, mixed>',
1900-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1900+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
19011901
),
19021902
'array_intersect_ukey\'1' =>
19031903
array (
@@ -2081,7 +2081,9 @@
20812081
array (
20822082
0 => 'array<array-key, mixed>',
20832083
'array' => 'array<array-key, mixed>',
2084-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2084+
'arr2' => 'array<array-key, mixed>',
2085+
'value_compare_func' => 'callable(mixed, mixed):int',
2086+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20852087
),
20862088
'array_udiff_uassoc\'1' =>
20872089
array (
@@ -2127,7 +2129,9 @@
21272129
array (
21282130
0 => 'array<array-key, mixed>',
21292131
'array' => 'array<array-key, mixed>',
2130-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2132+
'arr2' => 'array<array-key, mixed>',
2133+
'value_compare_func' => 'callable(mixed, mixed):int',
2134+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
21312135
),
21322136
'array_uintersect_uassoc\'1' =>
21332137
array (

‎dictionaries/CallMap_80.php

+10-6
Original file line numberDiff line numberDiff line change
@@ -1773,7 +1773,7 @@
17731773
array (
17741774
0 => 'array<array-key, mixed>',
17751775
'array' => 'array<array-key, mixed>',
1776-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1776+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17771777
),
17781778
'array_diff_uassoc\'1' =>
17791779
array (
@@ -1788,7 +1788,7 @@
17881788
array (
17891789
0 => 'array<array-key, mixed>',
17901790
'array' => 'array<array-key, mixed>',
1791-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1791+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
17921792
),
17931793
'array_diff_ukey\'1' =>
17941794
array (
@@ -1846,7 +1846,7 @@
18461846
array (
18471847
0 => 'array<array-key, mixed>',
18481848
'array' => 'array<array-key, mixed>',
1849-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1849+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18501850
),
18511851
'array_intersect_uassoc\'1' =>
18521852
array (
@@ -1861,7 +1861,7 @@
18611861
array (
18621862
0 => 'array<array-key, mixed>',
18631863
'array' => 'array<array-key, mixed>',
1864-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
1864+
'...rest' => 'array<array-key, mixed>|callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
18651865
),
18661866
'array_intersect_ukey\'1' =>
18671867
array (
@@ -2044,7 +2044,9 @@
20442044
array (
20452045
0 => 'array<array-key, mixed>',
20462046
'array' => 'array<array-key, mixed>',
2047-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2047+
'arr2' => 'array<array-key, mixed>',
2048+
'value_compare_func' => 'callable(mixed, mixed):int',
2049+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20482050
),
20492051
'array_udiff_uassoc\'1' =>
20502052
array (
@@ -2090,7 +2092,9 @@
20902092
array (
20912093
0 => 'array<array-key, mixed>',
20922094
'array' => 'array<array-key, mixed>',
2093-
'...rest' => 'array<array-key, mixed>|callable(mixed, mixed):int',
2095+
'arr2' => 'array<array-key, mixed>',
2096+
'value_compare_func' => 'callable(mixed, mixed):int',
2097+
'key_compare_func' => 'callable(array-key, array-key):int|callable(int, int):int|callable(string, string):int',
20942098
),
20952099
'array_uintersect_uassoc\'1' =>
20962100
array (

0 commit comments

Comments
 (0)