Skip to content

Commit 1945355

Browse files
author
Côme Chilliet
committed
Improve parameter names in ext/ldap
Merging PR 6153
1 parent 3b3445f commit 1945355

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎ext/ldap/ldap.stub.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@ function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?st
3737
* @param resource|array $ldap
3838
* @return resource|false
3939
*/
40-
function ldap_read($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
40+
function ldap_read($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
4141

4242
/**
4343
* @param resource|array $ldap
4444
* @return resource|false
4545
*/
46-
function ldap_list($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
46+
function ldap_list($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
4747

4848
/**
4949
* @param resource|array $ldap
5050
* @return resource|false
5151
*/
52-
function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
52+
function ldap_search($ldap, array|string $base, array|string $filter, array $attributes = [], int $attributes_only = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {}
5353

5454
/** @param resource $ldap */
5555
function ldap_free_result($ldap): bool {}
@@ -218,9 +218,9 @@ function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent,
218218

219219
/**
220220
* @param resource $ldap
221-
* @param array|string|int $retval
221+
* @param array|string|int $value
222222
*/
223-
function ldap_get_option($ldap, int $option, &$retval = null): bool {}
223+
function ldap_get_option($ldap, int $option, &$value = null): bool {}
224224

225225
/**
226226
* @param resource|null $ldap
@@ -261,13 +261,13 @@ function ldap_parse_reference($ldap, $entry, &$referrals): bool {}
261261
/**
262262
* @param resource $ldap
263263
* @param resource $result
264-
* @param int $errcode
265-
* @param string $matcheddn
266-
* @param string $errmsg
264+
* @param int $error_code
265+
* @param string $matched_dn
266+
* @param string $error_message
267267
* @param array $referrals
268268
* @param array $controls
269269
*/
270-
function ldap_parse_result($ldap, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {}
270+
function ldap_parse_result($ldap, $result, &$error_code, &$matched_dn = null, &$error_message = null, &$referrals = null, &$controls = null): bool {}
271271
#endif
272272
#endif
273273

@@ -293,11 +293,11 @@ function ldap_8859_to_t61(string $value): string|false {}
293293
#ifdef HAVE_LDAP_EXTENDED_OPERATION_S
294294
/**
295295
* @param resource $ldap
296-
* @param string $retdata
297-
* @param string $retoid
296+
* @param string $response_data
297+
* @param string $response_oid
298298
* @return resource|bool
299299
*/
300-
function ldap_exop($ldap, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {}
300+
function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = null, &$response_oid = null) {}
301301
#endif
302302

303303
#ifdef HAVE_LDAP_PASSWD
@@ -323,8 +323,8 @@ function ldap_exop_refresh($ldap, string $dn, int $ttl): int|false {}
323323
/**
324324
* @param resource $ldap
325325
* @param resource $result
326-
* @param string $retdata
327-
* @param string $retoid
326+
* @param string $response_data
327+
* @param string $response_oid
328328
*/
329-
function ldap_parse_exop($ldap, $result, &$retdata = null, &$retoid = null): bool {}
329+
function ldap_parse_exop($ldap, $result, &$response_data = null, &$response_oid = null): bool {}
330330
#endif

‎ext/ldap/ldap_arginfo.h

Lines changed: 15 additions & 15 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: 4802f25ebc9936ccd6e4705d07a49a61892b71f3 */
2+
* Stub hash: 0c721a3272fef9d1a06a8cb4163eeb219661fb00 */
33

44
#if defined(HAVE_ORALDAP)
55
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0)
@@ -55,7 +55,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3)
5555
ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
5656
ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL)
5757
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]")
58-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attrsonly, IS_LONG, 0, "0")
58+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes_only, IS_LONG, 0, "0")
5959
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sizelimit, IS_LONG, 0, "-1")
6060
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timelimit, IS_LONG, 0, "-1")
6161
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deref, IS_LONG, 0, "LDAP_DEREF_NEVER")
@@ -216,9 +216,9 @@ ZEND_END_ARG_INFO()
216216
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5)
217217
ZEND_ARG_INFO(0, ldap)
218218
ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0)
219-
ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0)
220-
ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0)
221-
ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0)
219+
ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0)
220+
ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0)
221+
ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0)
222222
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]")
223223
ZEND_END_ARG_INFO()
224224
#endif
@@ -227,7 +227,7 @@ ZEND_END_ARG_INFO()
227227
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0)
228228
ZEND_ARG_INFO(0, ldap)
229229
ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0)
230-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null")
230+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, value, "null")
231231
ZEND_END_ARG_INFO()
232232
#endif
233233

@@ -272,9 +272,9 @@ ZEND_END_ARG_INFO()
272272
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0)
273273
ZEND_ARG_INFO(0, ldap)
274274
ZEND_ARG_INFO(0, result)
275-
ZEND_ARG_INFO(1, errcode)
276-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null")
277-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errmsg, "null")
275+
ZEND_ARG_INFO(1, error_code)
276+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matched_dn, "null")
277+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null")
278278
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, referrals, "null")
279279
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null")
280280
ZEND_END_ARG_INFO()
@@ -312,11 +312,11 @@ ZEND_END_ARG_INFO()
312312
#if defined(HAVE_LDAP_EXTENDED_OPERATION_S)
313313
ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2)
314314
ZEND_ARG_INFO(0, ldap)
315-
ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0)
316-
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null")
315+
ZEND_ARG_TYPE_INFO(0, request_oid, IS_STRING, 0)
316+
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request_data, IS_STRING, 1, "null")
317317
ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]")
318-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
319-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
318+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
319+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
320320
ZEND_END_ARG_INFO()
321321
#endif
322322

@@ -348,8 +348,8 @@ ZEND_END_ARG_INFO()
348348
ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL, 0)
349349
ZEND_ARG_INFO(0, ldap)
350350
ZEND_ARG_INFO(0, result)
351-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null")
352-
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null")
351+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null")
352+
ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null")
353353
ZEND_END_ARG_INFO()
354354
#endif
355355

0 commit comments

Comments
 (0)