diff options
| author | Côme Chilliet <mcmic@php.net> | 2020-09-17 16:53:50 +0200 |
|---|---|---|
| committer | Côme Chilliet <mcmic@php.net> | 2020-09-29 16:31:07 +0200 |
| commit | eeec37d31d6aa4452d83e2640aee7c8c25349617 (patch) | |
| tree | c70e27bd4a88cd04b825cca7f82c6d494b154ca5 | |
| parent | caa0cd7705a2d7154f2f1b478fea8ce6efc370d1 (diff) | |
| download | php-git-eeec37d31d6aa4452d83e2640aee7c8c25349617.tar.gz | |
Remove dummy_ber parameter from ldap_first_attribute and ldap_next_attribute
It has been unused and deprecated since PHP 5.2.4
| -rw-r--r-- | ext/ldap/ldap.c | 6 | ||||
| -rw-r--r-- | ext/ldap/ldap.stub.php | 4 | ||||
| -rw-r--r-- | ext/ldap/ldap_arginfo.h | 8 |
3 files changed, 6 insertions, 12 deletions
diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 6a5f939878..b8f3c35ab9 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1909,9 +1909,8 @@ PHP_FUNCTION(ldap_first_attribute) ldap_linkdata *ld; ldap_resultentry *resultentry; char *attribute; - zend_long dummy_ber; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) { RETURN_THROWS(); } @@ -1941,9 +1940,8 @@ PHP_FUNCTION(ldap_next_attribute) ldap_linkdata *ld; ldap_resultentry *resultentry; char *attribute; - zend_long dummy_ber; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry, &dummy_ber) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry) != SUCCESS) { RETURN_THROWS(); } diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index a9ec590fe1..f7501ab6a5 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -85,13 +85,13 @@ function ldap_get_entries($link_identifier, $result_identifier): array|false {} * @param resource $link_identifier * @param resource $result_entry_identifier */ -function ldap_first_attribute($link_identifier, $result_entry_identifier, int $dummy_ber = UNKNOWN): string|false {} +function ldap_first_attribute($link_identifier, $result_entry_identifier): string|false {} /** * @param resource $link_identifier * @param resource $result_entry_identifier */ -function ldap_next_attribute($link_identifier, $result_entry_identifier, int $dummy_ber = UNKNOWN): string|false {} +function ldap_next_attribute($link_identifier, $result_entry_identifier): string|false {} /** * @param resource $link_identifier diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 1a19ee0c2a..84c889dc06 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,5 +1,5 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: b4dc34ec9daecb904236e487fd4cf736f5f3fc44 */ + * Stub hash: 93ddab4ae5660ed25b4a69f7aa900368f43e81e8 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) @@ -88,7 +88,6 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_first_attribute, 0, 2, MAY_BE_STRING|MAY_BE_FALSE) ZEND_ARG_INFO(0, link_identifier) ZEND_ARG_INFO(0, result_entry_identifier) - ZEND_ARG_TYPE_INFO(0, dummy_ber, IS_LONG, 0) ZEND_END_ARG_INFO() #define arginfo_ldap_next_attribute arginfo_ldap_first_attribute @@ -106,10 +105,7 @@ ZEND_END_ARG_INFO() #define arginfo_ldap_get_values arginfo_ldap_get_values_len -ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_dn, 0, 2, MAY_BE_STRING|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_entry_identifier) -ZEND_END_ARG_INFO() +#define arginfo_ldap_get_dn arginfo_ldap_first_attribute ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_explode_dn, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) |