Skip to content

Commit c13510a

Browse files
CrellCrell
committed
Change array_diff*() and array_intersect*() to have be more logically named parameters.
1 parent 8d4b605 commit c13510a

35 files changed

+1206
-1198
lines changed

‎ext/standard/basic_functions.stub.php

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -179,47 +179,47 @@ function array_change_key_case(array $array, int $case = CASE_LOWER): array {}
179179

180180
function array_unique(array $array, int $flags = SORT_STRING): array {}
181181

182-
function array_intersect_key(array $array1, array $array2, array ...$arrays): array {}
182+
function array_intersect_key(array $array, array $include, array ...$arrays): array {}
183183

184184
/** @param array|callable $rest */
185-
function array_intersect_ukey(array $array1, array $array2, ...$rest): array {}
185+
function array_intersect_ukey(array $array, array $include, ...$rest): array {}
186186

187-
function array_intersect(array $array1, array $array2, array ...$arrays): array {}
187+
function array_intersect(array $array, array $include, array ...$arrays): array {}
188188

189189
/** @param array|callable $rest */
190-
function array_uintersect(array $array1, array $array2, ...$rest): array {}
190+
function array_uintersect(array $array, array $include, ...$rest): array {}
191191

192-
function array_intersect_assoc(array $array1, array $array2, array ...$arrays): array {}
192+
function array_intersect_assoc(array $array, array $include, array ...$arrays): array {}
193193

194194
/** @param array|callable $rest */
195-
function array_uintersect_assoc(array $array1, array $array2, ...$rest): array {}
195+
function array_uintersect_assoc(array $array, array $include, ...$rest): array {}
196196

197197
/** @param array|callable $rest */
198-
function array_intersect_uassoc(array $array1, array $array2, ...$rest): array {}
198+
function array_intersect_uassoc(array $array, array $include, ...$rest): array {}
199199

200200
/** @param array|callable $rest */
201-
function array_uintersect_uassoc(array $array1, array $array2, ...$rest): array {}
201+
function array_uintersect_uassoc(array $array, array $include, ...$rest): array {}
202202

203-
function array_diff_key(array $array1, array $array2, array ...$arrays): array {}
203+
function array_diff_key(array $array, array $exclude, array ...$arrays): array {}
204204

205205
/** @param array|callable $rest */
206-
function array_diff_ukey(array $array1, array $array2, ...$rest): array {}
206+
function array_diff_ukey(array $array, array $exclude, ...$rest): array {}
207207

208-
function array_diff(array $array1, array $array2, array ...$arrays): array {}
208+
function array_diff(array $array, array $exclude, array ...$arrays): array {}
209209

210210
/** @param array|callable $rest */
211-
function array_udiff(array $array1, array $array2, ...$rest): array {}
211+
function array_udiff(array $array, array $exclude, ...$rest): array {}
212212

213-
function array_diff_assoc(array $array1, array $array2, array ...$arrays): array {}
213+
function array_diff_assoc(array $array, array $exclude, array ...$arrays): array {}
214214

215215
/** @param array|callable $rest */
216-
function array_diff_uassoc(array $array1, array $array2, ...$rest): array {}
216+
function array_diff_uassoc(array $array, array $exclude, ...$rest): array {}
217217

218218
/** @param array|callable $rest */
219-
function array_udiff_assoc(array $array1, array $array2, ...$rest): array {}
219+
function array_udiff_assoc(array $array, array $exclude, ...$rest): array {}
220220

221221
/** @param array|callable $rest */
222-
function array_udiff_uassoc(array $array1, array $array2, ...$rest): array {}
222+
function array_udiff_uassoc(array $array, array $exclude, ...$rest): array {}
223223

224224
/**
225225
* @param array $array1

‎ext/standard/basic_functions_arginfo.h

Lines changed: 21 additions & 13 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: a7ec515720965dd96ff1570b02e3a43a0e49eebf */
2+
* Stub hash: 2a3a38c584c5474a0987837b719e71719a02c8bd */
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)
@@ -274,14 +274,14 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_unique, 0, 1, IS_ARRAY, 0)
274274
ZEND_END_ARG_INFO()
275275

276276
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_key, 0, 2, IS_ARRAY, 0)
277-
ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0)
278-
ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0)
277+
ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
278+
ZEND_ARG_TYPE_INFO(0, include, IS_ARRAY, 0)
279279
ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0)
280280
ZEND_END_ARG_INFO()
281281

282282
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_intersect_ukey, 0, 2, IS_ARRAY, 0)
283-
ZEND_ARG_TYPE_INFO(0, array1, IS_ARRAY, 0)
284-
ZEND_ARG_TYPE_INFO(0, array2, IS_ARRAY, 0)
283+
ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
284+
ZEND_ARG_TYPE_INFO(0, include, IS_ARRAY, 0)
285285
ZEND_ARG_VARIADIC_INFO(0, rest)
286286
ZEND_END_ARG_INFO()
287287

@@ -297,21 +297,29 @@ ZEND_END_ARG_INFO()
297297

298298
#define arginfo_array_uintersect_uassoc arginfo_array_intersect_ukey
299299

300-
#define arginfo_array_diff_key arginfo_array_intersect_key
300+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_key, 0, 2, IS_ARRAY, 0)
301+
ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
302+
ZEND_ARG_TYPE_INFO(0, exclude, IS_ARRAY, 0)
303+
ZEND_ARG_VARIADIC_TYPE_INFO(0, arrays, IS_ARRAY, 0)
304+
ZEND_END_ARG_INFO()
301305

302-
#define arginfo_array_diff_ukey arginfo_array_intersect_ukey
306+
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_diff_ukey, 0, 2, IS_ARRAY, 0)
307+
ZEND_ARG_TYPE_INFO(0, array, IS_ARRAY, 0)
308+
ZEND_ARG_TYPE_INFO(0, exclude, IS_ARRAY, 0)
309+
ZEND_ARG_VARIADIC_INFO(0, rest)
310+
ZEND_END_ARG_INFO()
303311

304-
#define arginfo_array_diff arginfo_array_intersect_key
312+
#define arginfo_array_diff arginfo_array_diff_key
305313

306-
#define arginfo_array_udiff arginfo_array_intersect_ukey
314+
#define arginfo_array_udiff arginfo_array_diff_ukey
307315

308-
#define arginfo_array_diff_assoc arginfo_array_intersect_key
316+
#define arginfo_array_diff_assoc arginfo_array_diff_key
309317

310-
#define arginfo_array_diff_uassoc arginfo_array_intersect_ukey
318+
#define arginfo_array_diff_uassoc arginfo_array_diff_ukey
311319

312-
#define arginfo_array_udiff_assoc arginfo_array_intersect_ukey
320+
#define arginfo_array_udiff_assoc arginfo_array_diff_ukey
313321

314-
#define arginfo_array_udiff_uassoc arginfo_array_intersect_ukey
322+
#define arginfo_array_udiff_uassoc arginfo_array_diff_ukey
315323

316324
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_array_multisort, 0, 1, _IS_BOOL, 0)
317325
ZEND_ARG_INFO(ZEND_SEND_PREFER_REF, array1)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ try {
1515
echo "OK!";
1616
?>
1717
--EXPECT--
18-
array_diff(): Argument #2 ($array2) must be of type array, int given
18+
array_diff(): Argument #2 ($exclude) must be of type array, int given
1919
OK!

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,80 +100,80 @@ echo "Done";
100100
*** Testing array_diff_assoc() : usage variations ***
101101

102102
-- Iteration 1 --
103-
array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
103+
array_diff_assoc(): Argument #1 ($array) must be of type array, int given
104104

105105
-- Iteration 2 --
106-
array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
106+
array_diff_assoc(): Argument #1 ($array) must be of type array, int given
107107

108108
-- Iteration 3 --
109-
array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
109+
array_diff_assoc(): Argument #1 ($array) must be of type array, int given
110110

111111
-- Iteration 4 --
112-
array_diff_assoc(): Argument #1 ($array1) must be of type array, int given
112+
array_diff_assoc(): Argument #1 ($array) must be of type array, int given
113113

114114
-- Iteration 5 --
115-
array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
115+
array_diff_assoc(): Argument #1 ($array) must be of type array, float given
116116

117117
-- Iteration 6 --
118-
array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
118+
array_diff_assoc(): Argument #1 ($array) must be of type array, float given
119119

120120
-- Iteration 7 --
121-
array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
121+
array_diff_assoc(): Argument #1 ($array) must be of type array, float given
122122

123123
-- Iteration 8 --
124-
array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
124+
array_diff_assoc(): Argument #1 ($array) must be of type array, float given
125125

126126
-- Iteration 9 --
127-
array_diff_assoc(): Argument #1 ($array1) must be of type array, float given
127+
array_diff_assoc(): Argument #1 ($array) must be of type array, float given
128128

129129
-- Iteration 10 --
130-
array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
130+
array_diff_assoc(): Argument #1 ($array) must be of type array, null given
131131

132132
-- Iteration 11 --
133-
array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
133+
array_diff_assoc(): Argument #1 ($array) must be of type array, null given
134134

135135
-- Iteration 12 --
136-
array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
136+
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
137137

138138
-- Iteration 13 --
139-
array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
139+
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
140140

141141
-- Iteration 14 --
142-
array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
142+
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
143143

144144
-- Iteration 15 --
145-
array_diff_assoc(): Argument #1 ($array1) must be of type array, bool given
145+
array_diff_assoc(): Argument #1 ($array) must be of type array, bool given
146146

147147
-- Iteration 16 --
148-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
148+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
149149

150150
-- Iteration 17 --
151-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
151+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
152152

153153
-- Iteration 18 --
154-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
154+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
155155

156156
-- Iteration 19 --
157-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
157+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
158158

159159
-- Iteration 20 --
160-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
160+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
161161

162162
-- Iteration 21 --
163-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
163+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
164164

165165
-- Iteration 22 --
166-
array_diff_assoc(): Argument #1 ($array1) must be of type array, string given
166+
array_diff_assoc(): Argument #1 ($array) must be of type array, string given
167167

168168
-- Iteration 23 --
169-
array_diff_assoc(): Argument #1 ($array1) must be of type array, classA given
169+
array_diff_assoc(): Argument #1 ($array) must be of type array, classA given
170170

171171
-- Iteration 24 --
172-
array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
172+
array_diff_assoc(): Argument #1 ($array) must be of type array, null given
173173

174174
-- Iteration 25 --
175-
array_diff_assoc(): Argument #1 ($array1) must be of type array, null given
175+
array_diff_assoc(): Argument #1 ($array) must be of type array, null given
176176

177177
-- Iteration 26 --
178-
array_diff_assoc(): Argument #1 ($array1) must be of type array, resource given
178+
array_diff_assoc(): Argument #1 ($array) must be of type array, resource given
179179
Done

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

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,80 +100,80 @@ echo "Done";
100100
*** Testing array_diff_assoc() : usage variations ***
101101

102102
-- Iteration 1 --
103-
array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
103+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, int given
104104

105105
-- Iteration 2 --
106-
array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
106+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, int given
107107

108108
-- Iteration 3 --
109-
array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
109+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, int given
110110

111111
-- Iteration 4 --
112-
array_diff_assoc(): Argument #2 ($array2) must be of type array, int given
112+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, int given
113113

114114
-- Iteration 5 --
115-
array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
115+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, float given
116116

117117
-- Iteration 6 --
118-
array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
118+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, float given
119119

120120
-- Iteration 7 --
121-
array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
121+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, float given
122122

123123
-- Iteration 8 --
124-
array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
124+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, float given
125125

126126
-- Iteration 9 --
127-
array_diff_assoc(): Argument #2 ($array2) must be of type array, float given
127+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, float given
128128

129129
-- Iteration 10 --
130-
array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
130+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, null given
131131

132132
-- Iteration 11 --
133-
array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
133+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, null given
134134

135135
-- Iteration 12 --
136-
array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
136+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, bool given
137137

138138
-- Iteration 13 --
139-
array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
139+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, bool given
140140

141141
-- Iteration 14 --
142-
array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
142+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, bool given
143143

144144
-- Iteration 15 --
145-
array_diff_assoc(): Argument #2 ($array2) must be of type array, bool given
145+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, bool given
146146

147147
-- Iteration 16 --
148-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
148+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
149149

150150
-- Iteration 17 --
151-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
151+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
152152

153153
-- Iteration 18 --
154-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
154+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
155155

156156
-- Iteration 19 --
157-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
157+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
158158

159159
-- Iteration 20 --
160-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
160+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
161161

162162
-- Iteration 21 --
163-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
163+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
164164

165165
-- Iteration 22 --
166-
array_diff_assoc(): Argument #2 ($array2) must be of type array, string given
166+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, string given
167167

168168
-- Iteration 23 --
169-
array_diff_assoc(): Argument #2 ($array2) must be of type array, classA given
169+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, classA given
170170

171171
-- Iteration 24 --
172-
array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
172+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, null given
173173

174174
-- Iteration 25 --
175-
array_diff_assoc(): Argument #2 ($array2) must be of type array, null given
175+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, null given
176176

177177
-- Iteration 26 --
178-
array_diff_assoc(): Argument #2 ($array2) must be of type array, resource given
178+
array_diff_assoc(): Argument #2 ($exclude) must be of type array, resource given
179179
Done

0 commit comments

Comments
 (0)