Skip to content

Commit 5cd0434

Browse files
CrellCrell
committed
Change to .
1 parent b9e3de0 commit 5cd0434

File tree

4 files changed

+39
-39
lines changed

4 files changed

+39
-39
lines changed

‎ext/standard/basic_functions.stub.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ function stream_wrapper_restore(string $protocol): bool {}
5959

6060
function array_push(array &$stack, mixed ...$args): int {}
6161

62-
function krsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
62+
function krsort(array &$array, int $flags = SORT_REGULAR): bool {}
6363

64-
function ksort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
64+
function ksort(array &$array, int $flags = SORT_REGULAR): bool {}
6565

6666
/** @param array|Countable|null $var */
6767
function count($var, int $mode = COUNT_NORMAL): int {}
@@ -76,13 +76,13 @@ function natsort(array &$array): bool {}
7676

7777
function natcasesort(array &$array): bool {}
7878

79-
function asort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
79+
function asort(array &$array, int $flags = SORT_REGULAR): bool {}
8080

81-
function arsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
81+
function arsort(array &$array, int $flags = SORT_REGULAR): bool {}
8282

83-
function sort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
83+
function sort(array &$array, int $flags = SORT_REGULAR): bool {}
8484

85-
function rsort(array &$array, int $sort_flags = SORT_REGULAR): bool {}
85+
function rsort(array &$array, int $flags = SORT_REGULAR): bool {}
8686

8787
function usort(array &$array, callable $cmp_function): bool {}
8888

@@ -224,14 +224,14 @@ function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {}
224224
/**
225225
* @param array $array1
226226
* @param int $sort_order
227-
* @param int $sort_flags
227+
* @param int $flags
228228
* @param array $arrays
229229
* @prefer-ref $array1
230230
* @prefer-ref $sort_order
231-
* @prefer-ref $sort_flags
231+
* @prefer-ref $flags
232232
* @prefer-ref $arrays
233233
*/
234-
function array_multisort(&$array1, $sort_order = SORT_ASC, $sort_flags = SORT_REGULAR, &...$arrays): bool {}
234+
function array_multisort(&$array1, $sort_order = SORT_ASC, $flags = SORT_REGULAR, &...$arrays): bool {}
235235

236236
function array_rand(array $array, int $num_req = 1): int|string|array {}
237237

‎ext/standard/basic_functions_arginfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* This is a generated file, edit the .stub.php file instead.
2-
* Stub hash: 8b6ef365e9635c92ef86adb40b2aba077867f3b2 */
2+
* Stub hash: 0ce95e53e87e001a059e241081bdf063d47519dc */
33

44
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
55
ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -76,7 +76,7 @@ ZEND_END_ARG_INFO()
7676

7777
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_krsort, 0, 1, _IS_BOOL, 0)
7878
ZEND_ARG_TYPE_INFO(1, array, IS_ARRAY, 0)
79-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sort_flags, IS_LONG, 0, "SORT_REGULAR")
79+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, flags, IS_LONG, 0, "SORT_REGULAR")
8080
ZEND_END_ARG_INFO()
8181

8282
#define arginfo_ksort arginfo_krsort
@@ -316,7 +316,7 @@ ZEND_END_ARG_INFO()
316316
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_multisort, 0, 1, _IS_BOOL, 0)
317317
ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, array1)
318318
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(ZEND_SEND_PREFER_REF, sort_order, "SORT_ASC")
319-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(ZEND_SEND_PREFER_REF, sort_flags, "SORT_REGULAR")
319+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(ZEND_SEND_PREFER_REF, flags, "SORT_REGULAR")
320320
ZEND_ARG_VARIADIC_INFO(ZEND_SEND_PREFER_REF, arrays)
321321
ZEND_END_ARG_INFO()
322322

‎ext/standard/tests/array/array_multisort_error.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ try {
2525
*** Testing array_multisort() : error conditions ***
2626

2727
-- Testing array_multisort() function with repeated flags --
28-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
28+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag that has not already been specified
2929

3030
-- Testing array_multisort() function with repeated flags --
31-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
31+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag that has not already been specified

‎ext/standard/tests/array/array_multisort_variation3.phpt

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -103,76 +103,76 @@ foreach($inputs as $key =>$value) {
103103
*** Testing array_multisort() : usage variation ***
104104

105105
--int 0--
106-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
106+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag that has not already been specified
107107

108108
--int 1--
109-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag that has not already been specified
109+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag that has not already been specified
110110

111111
--int 12345--
112-
array_multisort(): Argument #3 ($sort_flags) must be a valid sort flag
112+
array_multisort(): Argument #3 ($flags) must be a valid sort flag
113113

114114
--int -12345--
115-
array_multisort(): Argument #3 ($sort_flags) must be a valid sort flag
115+
array_multisort(): Argument #3 ($flags) must be a valid sort flag
116116

117117
--float 10.5--
118-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
118+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
119119

120120
--float -10.5--
121-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
121+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
122122

123123
--float 12.3456789000e10--
124-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
124+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
125125

126126
--float -12.3456789000e10--
127-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
127+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
128128

129129
--float .5--
130-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
130+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
131131

132132
--uppercase NULL--
133-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
133+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
134134

135135
--lowercase null--
136-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
136+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
137137

138138
--lowercase true--
139-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
139+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
140140

141141
--lowercase false--
142-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
142+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
143143

144144
--uppercase TRUE--
145-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
145+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
146146

147147
--uppercase FALSE--
148-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
148+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
149149

150150
--empty string DQ--
151-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
151+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
152152

153153
--empty string SQ--
154-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
154+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
155155

156156
--string DQ--
157-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
157+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
158158

159159
--string SQ--
160-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
160+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
161161

162162
--mixed case string--
163-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
163+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
164164

165165
--heredoc--
166-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
166+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
167167

168168
--instance of classWithToString--
169-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
169+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
170170

171171
--instance of classWithoutToString--
172-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
172+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
173173

174174
--undefined var--
175-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
175+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag
176176

177177
--unset var--
178-
array_multisort(): Argument #3 ($sort_flags) must be an array or a sort flag
178+
array_multisort(): Argument #3 ($flags) must be an array or a sort flag

0 commit comments

Comments
 (0)