From 0dfede7087d2d802f25a560fa74e2029080e0c20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 16:03:43 +0200 Subject: [PATCH 01/16] Make URI parameter in ldap_connect default to NULL --- ext/ldap/ldap.c | 4 ++-- ext/ldap/ldap.stub.php | 4 ++-- ext/ldap/ldap_arginfo.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 03926e5a0794f..3fb04d465a38a 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1001,7 +1001,7 @@ PHP_FUNCTION(ldap_connect) WRONG_PARAM_COUNT; } - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|slssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!lssl", &host, &hostlen, &port, &wallet, &walletlen, &walletpasswd, &walletpasswdlen, &authmode) != SUCCESS) { RETURN_THROWS(); } @@ -1009,7 +1009,7 @@ PHP_FUNCTION(ldap_connect) ssl = 1; } #else - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sl", &host, &hostlen, &port) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!l", &host, &hostlen, &port) != SUCCESS) { RETURN_THROWS(); } #endif diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 372458fe78b9e..2c48b812464ad 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -4,10 +4,10 @@ #ifdef HAVE_ORALDAP /** @return resource|false */ -function ldap_connect(string $hostname = UNKNOWN, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} +function ldap_connect(string $uri = NULL, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} #else /** @return resource|false */ -function ldap_connect(string $hostname = UNKNOWN, int $port = 389) {} +function ldap_connect(string $uri = NULL, int $port = 389) {} #endif /** @param resource $link_identifier */ diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index d610408d97423..4be65ae9b26c2 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,9 +1,9 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: f07138972651411473c34c5ee2d0c2de94e01ada */ + * Stub hash: 7db7fd320ca8ac2501d22f6cb473a08f47b82ad3 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "NULL") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, wallet_passwd, IS_STRING, 0) @@ -13,7 +13,7 @@ ZEND_END_ARG_INFO() #if !(defined(HAVE_ORALDAP)) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO(0, hostname, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "NULL") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_END_ARG_INFO() #endif From a4b7df59e9e2c1091c5070ce6ec16e7858e94047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 16:40:04 +0200 Subject: [PATCH 02/16] Default bind dn and password to NULL in ldap_bind --- ext/ldap/ldap.c | 2 +- ext/ldap/ldap.stub.php | 2 +- ext/ldap/ldap_arginfo.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 3fb04d465a38a..e6e23d1b5c28b 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1119,7 +1119,7 @@ PHP_FUNCTION(ldap_bind) ldap_linkdata *ld; int rc; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ss", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen) != SUCCESS) { RETURN_THROWS(); } diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 2c48b812464ad..8187167becaa1 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -20,7 +20,7 @@ function ldap_unbind($link_identifier): bool {} function ldap_close($link_identifier): bool {} /** @param resource $link_identifier */ -function ldap_bind($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN): bool {} +function ldap_bind($link_identifier, string $bind_rdn = NULL, string $bind_password = NULL): bool {} /** * @param resource $link_identifier diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 4be65ae9b26c2..9929281a7cdc9 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: 7db7fd320ca8ac2501d22f6cb473a08f47b82ad3 */ + * Stub hash: 53a23f4146cec03d90833de5a80a550199460207 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) @@ -26,8 +26,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO(0, bind_rdn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, bind_password, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "NULL") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) From 8667f5ce46102ffd49496db98d76670863927415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 16:42:17 +0200 Subject: [PATCH 03/16] Default bind dn and password to NULL in ldap_bind_ext --- ext/ldap/ldap.c | 2 +- ext/ldap/ldap.stub.php | 2 +- ext/ldap/ldap_arginfo.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index e6e23d1b5c28b..6d000c41e228f 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1175,7 +1175,7 @@ PHP_FUNCTION(ldap_bind_ext) LDAPMessage *ldap_res; int rc; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|ssa", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!a", &link, &ldap_bind_dn, &ldap_bind_dnlen, &ldap_bind_pw, &ldap_bind_pwlen, &serverctrls) != SUCCESS) { RETURN_THROWS(); } diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 8187167becaa1..243e57b1427d9 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -26,7 +26,7 @@ function ldap_bind($link_identifier, string $bind_rdn = NULL, string $bind_passw * @param resource $link_identifier * @return resource|false */ -function ldap_bind_ext($link_identifier, string $bind_rdn = UNKNOWN, string $bind_password = UNKNOWN, array $servercontrols = []) {} +function ldap_bind_ext($link_identifier, string $bind_rdn = NULL, string $bind_password = NULL, array $servercontrols = []) {} #ifdef HAVE_LDAP_SASL /** @param resource $link */ diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 9929281a7cdc9..24cb31304bf82 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: 53a23f4146cec03d90833de5a80a550199460207 */ + * Stub hash: 4414873610a8b2099ddad28cbadd6b8d75f66431 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) @@ -32,8 +32,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO(0, bind_rdn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, bind_password, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "NULL") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() From d2645cbda0484505e7e6631e2927de21300241bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 16:47:12 +0200 Subject: [PATCH 04/16] Set all parameters to ldap_sasl_bind as NULL by default For mech, realm, authcid, authzid and props NULL means do not change current server setting. --- ext/ldap/ldap.c | 2 +- ext/ldap/ldap.stub.php | 2 +- ext/ldap/ldap_arginfo.h | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index 6d000c41e228f..3a07f7b07fadc 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1337,7 +1337,7 @@ PHP_FUNCTION(ldap_sasl_bind) size_t rc, dn_len, passwd_len, mech_len, realm_len, authc_id_len, authz_id_len, props_len; php_ldap_bictx *ctx; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|sssssss", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|s!s!s!s!s!s!s!", &link, &binddn, &dn_len, &passwd, &passwd_len, &sasl_mech, &mech_len, &sasl_realm, &realm_len, &sasl_authc_id, &authc_id_len, &sasl_authz_id, &authz_id_len, &props, &props_len) != SUCCESS) { RETURN_THROWS(); } diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 243e57b1427d9..a9ec590fe1e02 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -30,7 +30,7 @@ function ldap_bind_ext($link_identifier, string $bind_rdn = NULL, string $bind_p #ifdef HAVE_LDAP_SASL /** @param resource $link */ -function ldap_sasl_bind($link, string $binddn = UNKNOWN, string $password = UNKNOWN, string $sasl_mech = UNKNOWN, string $sasl_realm = UNKNOWN, string $sasl_authc_id = UNKNOWN, string $sasl_authz_id = UNKNOWN, string $props = UNKNOWN): bool {} +function ldap_sasl_bind($link, string $binddn = NULL, string $password = NULL, string $sasl_mech = NULL, string $sasl_realm = NULL, string $sasl_authc_id = NULL, string $sasl_authz_id = NULL, string $props = NULL): bool {} #endif /** diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 24cb31304bf82..1a19ee0c2abaa 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: 4414873610a8b2099ddad28cbadd6b8d75f66431 */ + * Stub hash: b4dc34ec9daecb904236e487fd4cf736f5f3fc44 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) @@ -40,13 +40,13 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_SASL) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO(0, binddn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, sasl_mech, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, sasl_realm, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, sasl_authc_id, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, sasl_authz_id, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, props, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binddn, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_mech, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_realm, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authc_id, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authz_id, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 0, "NULL") ZEND_END_ARG_INFO() #endif From cd38890ecc65fd00b6d86fe83338e4cb54ff9d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 16:53:50 +0200 Subject: [PATCH 05/16] Remove dummy_ber parameter from ldap_first_attribute and ldap_next_attribute It has been unused and deprecated since PHP 5.2.4 --- ext/ldap/ldap.c | 6 ++---- ext/ldap/ldap.stub.php | 4 ++-- 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 3a07f7b07fadc..c3aaf03c80b7e 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 a9ec590fe1e02..f7501ab6a5634 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 1a19ee0c2abaa..84c889dc06128 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) From d2e13e38f11cee09398deeb50aebc562af648a21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 17:03:23 +0200 Subject: [PATCH 06/16] Fix "null" case in ldap.stub.php --- ext/ldap/ldap.stub.php | 10 +++++----- ext/ldap/ldap_arginfo.h | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index f7501ab6a5634..507700365c8b8 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -4,10 +4,10 @@ #ifdef HAVE_ORALDAP /** @return resource|false */ -function ldap_connect(string $uri = NULL, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} +function ldap_connect(string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} #else /** @return resource|false */ -function ldap_connect(string $uri = NULL, int $port = 389) {} +function ldap_connect(string $uri = null, int $port = 389) {} #endif /** @param resource $link_identifier */ @@ -20,17 +20,17 @@ function ldap_unbind($link_identifier): bool {} function ldap_close($link_identifier): bool {} /** @param resource $link_identifier */ -function ldap_bind($link_identifier, string $bind_rdn = NULL, string $bind_password = NULL): bool {} +function ldap_bind($link_identifier, string $bind_rdn = null, string $bind_password = null): bool {} /** * @param resource $link_identifier * @return resource|false */ -function ldap_bind_ext($link_identifier, string $bind_rdn = NULL, string $bind_password = NULL, array $servercontrols = []) {} +function ldap_bind_ext($link_identifier, string $bind_rdn = null, string $bind_password = null, array $servercontrols = []) {} #ifdef HAVE_LDAP_SASL /** @param resource $link */ -function ldap_sasl_bind($link, string $binddn = NULL, string $password = NULL, string $sasl_mech = NULL, string $sasl_realm = NULL, string $sasl_authc_id = NULL, string $sasl_authz_id = NULL, string $props = NULL): bool {} +function ldap_sasl_bind($link, string $binddn = null, string $password = null, string $sasl_mech = null, string $sasl_realm = null, string $sasl_authc_id = null, string $sasl_authz_id = null, string $props = null): bool {} #endif /** diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 84c889dc06128..ed97aae13245a 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,9 +1,9 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 93ddab4ae5660ed25b4a69f7aa900368f43e81e8 */ + * Stub hash: 6f6efbc58e9c1db3f65ccdca286f97e2c97ac0c5 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, wallet_passwd, IS_STRING, 0) @@ -13,7 +13,7 @@ ZEND_END_ARG_INFO() #if !(defined(HAVE_ORALDAP)) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_END_ARG_INFO() #endif @@ -26,27 +26,27 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_SASL) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binddn, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_mech, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_realm, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authc_id, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authz_id, IS_STRING, 0, "NULL") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 0, "NULL") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binddn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_mech, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_realm, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authc_id, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authz_id, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 0, "null") ZEND_END_ARG_INFO() #endif From 1b828b8fefe1266e4910ffc343bb9bace7952701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Thu, 17 Sep 2020 17:13:48 +0200 Subject: [PATCH 07/16] Fix parameter names in ext/ldap Renamed all parameters to be consistent and concise --- ext/ldap/ldap.stub.php | 182 +++++++++++++------------- ext/ldap/ldap_arginfo.h | 106 +++++++-------- ext/ldap/tests/ldap_search_error.phpt | 4 +- 3 files changed, 146 insertions(+), 146 deletions(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 507700365c8b8..6cc89b6137696 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -10,171 +10,171 @@ function ldap_connect(string $uri = null, int $port = 389, string $wallet = UNKN function ldap_connect(string $uri = null, int $port = 389) {} #endif -/** @param resource $link_identifier */ -function ldap_unbind($link_identifier): bool {} +/** @param resource $link */ +function ldap_unbind($link): bool {} /** - * @param resource $link_identifier + * @param resource $link * @alias ldap_unbind */ -function ldap_close($link_identifier): bool {} +function ldap_close($link): bool {} -/** @param resource $link_identifier */ -function ldap_bind($link_identifier, string $bind_rdn = null, string $bind_password = null): bool {} +/** @param resource $link */ +function ldap_bind($link, string $dn = null, string $password = null): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_bind_ext($link_identifier, string $bind_rdn = null, string $bind_password = null, array $servercontrols = []) {} +function ldap_bind_ext($link, string $dn = null, string $password = null, array $controls = []) {} #ifdef HAVE_LDAP_SASL /** @param resource $link */ -function ldap_sasl_bind($link, string $binddn = null, string $password = null, string $sasl_mech = null, string $sasl_realm = null, string $sasl_authc_id = null, string $sasl_authz_id = null, string $props = null): bool {} +function ldap_sasl_bind($link, string $dn = null, string $password = null, string $mech = null, string $realm = null, string $authc_id = null, string $authz_id = null, string $props = null): bool {} #endif /** - * @param resource|array $link_identifier + * @param resource|array $link * @return resource|false */ -function ldap_read($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {} +function ldap_read($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} /** - * @param resource|array $link_identifier + * @param resource|array $link * @return resource|false */ -function ldap_list($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {} +function ldap_list($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} /** - * @param resource|array $link_identifier + * @param resource|array $link * @return resource|false */ -function ldap_search($link_identifier, array|string $base_dn, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $servercontrols = []) {} +function ldap_search($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} -/** @param resource $link_identifier */ -function ldap_free_result($link_identifier): bool {} +/** @param resource $link */ +function ldap_free_result($link): bool {} /** - * @param resource $link_identifier - * @param resource $result_identifier + * @param resource $link + * @param resource $result */ -function ldap_count_entries($link_identifier, $result_identifier): int {} +function ldap_count_entries($link, $result): int {} /** - * @param resource $link_identifier - * @param resource $result_identifier + * @param resource $link + * @param resource $result * @return resource|false */ -function ldap_first_entry($link_identifier, $result_identifier) {} +function ldap_first_entry($link, $result) {} /** - * @param resource $link_identifier - * @param resource $result_identifier + * @param resource $link + * @param resource $result * @return resource|false */ -function ldap_next_entry($link_identifier, $result_identifier) {} +function ldap_next_entry($link, $result) {} /** - * @param resource $link_identifier - * @param resource $result_identifier + * @param resource $link + * @param resource $result */ -function ldap_get_entries($link_identifier, $result_identifier): array|false {} +function ldap_get_entries($link, $result): array|false {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry */ -function ldap_first_attribute($link_identifier, $result_entry_identifier): string|false {} +function ldap_first_attribute($link, $entry): string|false {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry */ -function ldap_next_attribute($link_identifier, $result_entry_identifier): string|false {} +function ldap_next_attribute($link, $entry): string|false {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry */ -function ldap_get_attributes($link_identifier, $result_entry_identifier): array {} +function ldap_get_attributes($link, $entry): array {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry */ -function ldap_get_values_len($link_identifier, $result_entry_identifier, string $attribute): array|false {} +function ldap_get_values_len($link, $entry, string $attribute): array|false {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry * @alias ldap_get_values_len */ -function ldap_get_values($link_identifier, $result_entry_identifier, string $attribute): array|false {} +function ldap_get_values($link, $entry, string $attribute): array|false {} /** - * @param resource $link_identifier - * @param resource $result_entry_identifier + * @param resource $link + * @param resource $entry */ -function ldap_get_dn($link_identifier, $result_entry_identifier): string|false {} +function ldap_get_dn($link, $entry): string|false {} function ldap_explode_dn(string $dn, int $with_attrib): array|false {} function ldap_dn2ufn(string $dn): string|false {} -/** @param resource $link_identifier */ -function ldap_add($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_add($link, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_add_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {} +function ldap_add_ext($link, string $dn, array $entry, array $controls = []) {} -/** @param resource $link_identifier */ -function ldap_delete($link_identifier, string $dn, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_delete($link, string $dn, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_delete_ext($link_identifier, string $dn, array $servercontrols = []) {} +function ldap_delete_ext($link, string $dn, array $controls = []) {} -/** @param resource $link_identifier */ -function ldap_modify_batch($link_identifier, string $dn, array $modifications_info, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_modify_batch($link, string $dn, array $modifications_info, array $controls = []): bool {} -/** @param resource $link_identifier */ -function ldap_mod_add($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_mod_add($link, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_mod_add_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {} +function ldap_mod_add_ext($link, string $dn, array $entry, array $controls = []) {} -/** @param resource $link_identifier */ -function ldap_mod_replace($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_mod_replace($link, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @alias ldap_mod_replace */ -function ldap_modify($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {} +function ldap_modify($link, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_mod_replace_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {} +function ldap_mod_replace_ext($link, string $dn, array $entry, array $controls = []) {} -/** @param resource $link_identifier */ -function ldap_mod_del($link_identifier, string $dn, array $entry, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_mod_del($link, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_mod_del_ext($link_identifier, string $dn, array $entry, array $servercontrols = []) {} +function ldap_mod_del_ext($link, string $dn, array $entry, array $controls = []) {} /** @param resource $link */ function ldap_errno($link): int {} @@ -184,8 +184,8 @@ function ldap_error($link): string {} function ldap_err2str(int $errno): string {} -/** @param resource $link_identifier */ -function ldap_compare($link_identifier, string $dn, string $attribute, string $value, array $servercontrols = []): bool|int {} +/** @param resource $link */ +function ldap_compare($link, string $dn, string $attribute, string $value, array $controls = []): bool|int {} #ifdef LDAP_CONTROL_PAGEDRESULTS @@ -206,33 +206,33 @@ function ldap_control_paged_result_response($link, $result, &$cookie = null, &$e #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) -/** @param resource $link_identifier */ -function ldap_rename($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []): bool {} +/** @param resource $link */ +function ldap_rename($link, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []): bool {} /** - * @param resource $link_identifier + * @param resource $link * @return resource|false */ -function ldap_rename_ext($link_identifier, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $servercontrols = []) {} +function ldap_rename_ext($link, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []) {} /** - * @param resource $link_identifier + * @param resource $link * @param array|string|int $retval */ -function ldap_get_option($link_identifier, int $option, &$retval = null): bool {} +function ldap_get_option($link, int $option, &$retval = null): bool {} /** - * @param resource|null $link_identifier + * @param resource|null $link * @param array|string|int|bool $newval */ -function ldap_set_option($link_identifier, int $option, $newval): bool {} +function ldap_set_option($link, int $option, $newval): bool {} /** - * @param resource $link_identifier - * @param resource $result_identifier + * @param resource $link + * @param resource $result */ -function ldap_count_references($link_identifier, $result_identifier): int {} +function ldap_count_references($link, $result): int {} /** * @param resource $link @@ -265,9 +265,9 @@ function ldap_parse_reference($link, $entry, &$referrals): bool {} * @param string $matcheddn * @param string $errmsg * @param array $referrals - * @param array $serverctrls + * @param array $controls */ -function ldap_parse_result($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$serverctrls = null): bool {} +function ldap_parse_result($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {} #endif #endif @@ -277,8 +277,8 @@ function ldap_set_rebind_proc($link, ?callable $callback): bool {} #endif #ifdef HAVE_LDAP_START_TLS_S -/** @param resource $link_identifier */ -function ldap_start_tls($link_identifier): bool {} +/** @param resource $link */ +function ldap_start_tls($link): bool {} #endif function ldap_escape(string $value, string $ignore = "", int $flags = 0): string {} @@ -297,15 +297,15 @@ function ldap_8859_to_t61(string $value): string|false {} * @param string $retoid * @return resource|bool */ -function ldap_exop($link, string $reqoid, ?string $reqdata = null, ?array $servercontrols = [], &$retdata = null, &$retoid = null) {} +function ldap_exop($link, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {} #endif #ifdef HAVE_LDAP_PASSWD /** * @param resource $link - * @param array $serverctrls + * @param array $controls */ -function ldap_exop_passwd($link, string $user = "", string $oldpw = "", string $newpw = "", &$serverctrls = null): string|bool {} +function ldap_exop_passwd($link, string $user = "", string $oldpw = "", string $newpw = "", &$controls = null): string|bool {} #endif diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index ed97aae13245a..922e66997cb71 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: 6f6efbc58e9c1db3f65ccdca286f97e2c97ac0c5 */ + * Stub hash: daec139fe03acf248017060876e80bf7cab89e3a */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) @@ -19,47 +19,47 @@ ZEND_END_ARG_INFO() #endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_unbind, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_END_ARG_INFO() #define arginfo_ldap_close arginfo_ldap_unbind ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "null") + ZEND_ARG_INFO(0, link) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_rdn, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, bind_password, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_INFO(0, link) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_SASL) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, binddn, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_mech, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_realm, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authc_id, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sasl_authz_id, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mech, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, realm, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authc_id, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authz_id, IS_STRING, 0, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 0, "null") ZEND_END_ARG_INFO() #endif ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_TYPE_MASK(0, base_dn, MAY_BE_ARRAY|MAY_BE_STRING, NULL) + ZEND_ARG_INFO(0, link) + ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attrsonly, IS_LONG, 0, "0") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sizelimit, IS_LONG, 0, "-1") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timelimit, IS_LONG, 0, "-1") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deref, IS_LONG, 0, "LDAP_DEREF_NEVER") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #define arginfo_ldap_list arginfo_ldap_read @@ -69,37 +69,37 @@ ZEND_END_ARG_INFO() #define arginfo_ldap_free_result arginfo_ldap_unbind ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_entries, 0, 2, IS_LONG, 0) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_entry, 0, 0, 2) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #define arginfo_ldap_next_entry arginfo_ldap_first_entry ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_entries, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, result) 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_INFO(0, link) + ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() #define arginfo_ldap_next_attribute arginfo_ldap_first_attribute ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_attributes, 0, 2, IS_ARRAY, 0) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_entry_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_values_len, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_entry_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, entry) ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -117,36 +117,36 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_dn2ufn, 0, 1, MAY_BE_STRING ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_add, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_add_ext, 0, 0, 3) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_delete, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete_ext, 0, 0, 2) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_modify_batch, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, modifications_info, IS_ARRAY, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #define arginfo_ldap_mod_add arginfo_ldap_add @@ -176,11 +176,11 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_err2str, 0, 1, IS_STRING, 0 ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_compare, 0, 4, MAY_BE_BOOL|MAY_BE_LONG) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #if defined(LDAP_CONTROL_PAGEDRESULTS) @@ -203,29 +203,29 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 0, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null") ZEND_END_ARG_INFO() @@ -233,7 +233,7 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) ZEND_ARG_INFO(0, newval) ZEND_END_ARG_INFO() @@ -241,8 +241,8 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_references, 0, 2, IS_LONG, 0) - ZEND_ARG_INFO(0, link_identifier) - ZEND_ARG_INFO(0, result_identifier) + ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #endif @@ -276,7 +276,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOO ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errmsg, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, referrals, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, serverctrls, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null") ZEND_END_ARG_INFO() #endif @@ -289,7 +289,7 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_START_TLS_S) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_start_tls, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link_identifier) + ZEND_ARG_INFO(0, link) ZEND_END_ARG_INFO() #endif @@ -314,7 +314,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2) ZEND_ARG_INFO(0, link) ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, servercontrols, IS_ARRAY, 1, "[]") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null") ZEND_END_ARG_INFO() @@ -326,7 +326,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_passwd, 0, 1, MAY_BE_S ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, user, IS_STRING, 0, "\"\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oldpw, IS_STRING, 0, "\"\"") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, newpw, IS_STRING, 0, "\"\"") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, serverctrls, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null") ZEND_END_ARG_INFO() #endif diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt index cc4653f2b7bf2..2eec205ef58a3 100644 --- a/ext/ldap/tests/ldap_search_error.phpt +++ b/ext/ldap/tests/ldap_search_error.phpt @@ -46,6 +46,6 @@ bool(false) Warning: ldap_search(): Array initialization wrong in %s on line %d bool(false) -ldap_search(): Argument #1 ($link_identifier) cannot be empty -ldap_search(): Argument #2 ($base_dn) must have the same number of elements as the links array +ldap_search(): Argument #1 ($link) cannot be empty +ldap_search(): Argument #2 ($base) must have the same number of elements as the links array ldap_search(): Argument #3 ($filter) must have the same number of elements as the links array From e2f91d69af1d5d60f19e491642251786d4df0aa2 Mon Sep 17 00:00:00 2001 From: MCMic Date: Thu, 17 Sep 2020 18:14:23 +0200 Subject: [PATCH 08/16] Fix parameter mask in ldap_next_attribute Co-authored-by: Nikita Popov --- ext/ldap/ldap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index c3aaf03c80b7e..a25708f1dd459 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1941,7 +1941,7 @@ PHP_FUNCTION(ldap_next_attribute) ldap_resultentry *resultentry; char *attribute; - if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr|l", &link, &result_entry) != SUCCESS) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rr", &link, &result_entry) != SUCCESS) { RETURN_THROWS(); } From 79f0efe1a2da782df19cf0cd22341ffcb1f29c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 21 Sep 2020 14:50:15 +0200 Subject: [PATCH 09/16] Explicitely mark nullable strings --- ext/ldap/ldap.stub.php | 10 +++++----- ext/ldap/ldap_arginfo.h | 28 ++++++++++++++-------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 6cc89b6137696..1c534284fd823 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -4,10 +4,10 @@ #ifdef HAVE_ORALDAP /** @return resource|false */ -function ldap_connect(string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} +function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} #else /** @return resource|false */ -function ldap_connect(string $uri = null, int $port = 389) {} +function ldap_connect(?string $uri = null, int $port = 389) {} #endif /** @param resource $link */ @@ -20,17 +20,17 @@ function ldap_unbind($link): bool {} function ldap_close($link): bool {} /** @param resource $link */ -function ldap_bind($link, string $dn = null, string $password = null): bool {} +function ldap_bind($link, ?string $dn = null, ?string $password = null): bool {} /** * @param resource $link * @return resource|false */ -function ldap_bind_ext($link, string $dn = null, string $password = null, array $controls = []) {} +function ldap_bind_ext($link, ?string $dn = null, ?string $password = null, array $controls = []) {} #ifdef HAVE_LDAP_SASL /** @param resource $link */ -function ldap_sasl_bind($link, string $dn = null, string $password = null, string $mech = null, string $realm = null, string $authc_id = null, string $authz_id = null, string $props = null): bool {} +function ldap_sasl_bind($link, ?string $dn = null, ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authc_id = null, ?string $authz_id = null, ?string $props = null): bool {} #endif /** diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 922e66997cb71..25f8227911c29 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,9 +1,9 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: daec139fe03acf248017060876e80bf7cab89e3a */ + * Stub hash: 739893b4bf6f34da80b7c7b10a670c16d4239bdb */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, wallet_passwd, IS_STRING, 0) @@ -13,7 +13,7 @@ ZEND_END_ARG_INFO() #if !(defined(HAVE_ORALDAP)) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_END_ARG_INFO() #endif @@ -26,27 +26,27 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_SASL) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0) ZEND_ARG_INFO(0, link) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mech, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, realm, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authc_id, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authz_id, IS_STRING, 0, "null") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 0, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mech, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, realm, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authc_id, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authz_id, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, props, IS_STRING, 1, "null") ZEND_END_ARG_INFO() #endif From 6141ba8470305d6417daecd98b6f1fa6a5cc22ad Mon Sep 17 00:00:00 2001 From: MCMic Date: Mon, 28 Sep 2020 14:18:43 +0200 Subject: [PATCH 10/16] Improve parameter naming in ldap_set_option ext/ldap/ldap.stub.php Co-authored-by: Nikita Popov --- ext/ldap/ldap.stub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 1c534284fd823..dd5bcf3f28979 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -226,7 +226,7 @@ function ldap_get_option($link, int $option, &$retval = null): bool {} * @param resource|null $link * @param array|string|int|bool $newval */ -function ldap_set_option($link, int $option, $newval): bool {} +function ldap_set_option($link, int $option, $value): bool {} /** * @param resource $link From 7c4e1aa14bceb93605bc065c79633358b159fec2 Mon Sep 17 00:00:00 2001 From: MCMic Date: Mon, 28 Sep 2020 14:19:43 +0200 Subject: [PATCH 11/16] Improve parameter naming in ldap_connect Co-authored-by: Nikita Popov --- ext/ldap/ldap.stub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index dd5bcf3f28979..941ec5ba58e71 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -4,7 +4,7 @@ #ifdef HAVE_ORALDAP /** @return resource|false */ -function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $wallet_passwd = UNKNOWN, int $authmode = GSLC_SSL_NO_AUTH) {} +function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNKNOWN, string $password = UNKNOWN, int $auth_mode = GSLC_SSL_NO_AUTH) {} #else /** @return resource|false */ function ldap_connect(?string $uri = null, int $port = 389) {} From 998814a53b4de936466aba32f7880cde293f18ba Mon Sep 17 00:00:00 2001 From: MCMic Date: Mon, 28 Sep 2020 14:20:28 +0200 Subject: [PATCH 12/16] Improve parameter naming in ldap_exop_passwd Co-authored-by: Nikita Popov --- ext/ldap/ldap.stub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 941ec5ba58e71..dc92eb2bb13f9 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -305,7 +305,7 @@ function ldap_exop($link, string $reqoid, ?string $reqdata = null, ?array $contr * @param resource $link * @param array $controls */ -function ldap_exop_passwd($link, string $user = "", string $oldpw = "", string $newpw = "", &$controls = null): string|bool {} +function ldap_exop_passwd($link, string $user = "", string $old_password = "", string $new_password = "", &$controls = null): string|bool {} #endif From 104fef4c1f3455e21af37ad96da4563733ea22ab Mon Sep 17 00:00:00 2001 From: MCMic Date: Mon, 28 Sep 2020 14:20:48 +0200 Subject: [PATCH 13/16] Improve parameter naming in ldap_rename Co-authored-by: Nikita Popov --- ext/ldap/ldap.stub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index dc92eb2bb13f9..a5233f473eefc 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -207,7 +207,7 @@ function ldap_control_paged_result_response($link, $result, &$cookie = null, &$e #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) /** @param resource $link */ -function ldap_rename($link, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []): bool {} +function ldap_rename($link, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []): bool {} /** * @param resource $link From 2cf6e24d1d309fb25769f81989109506942433d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Mon, 28 Sep 2020 14:52:40 +0200 Subject: [PATCH 14/16] Rename $link parameters to $ldap in ldap functions Also fixed ldap_set_option places where $newvalue was still used --- ext/ldap/ldap.c | 4 +- ext/ldap/ldap.stub.php | 210 +++++++++++----------- ext/ldap/ldap_arginfo.h | 92 +++++----- ext/ldap/tests/ldap_search_error.phpt | 2 +- ext/ldap/tests/ldap_set_option_error.phpt | 4 +- 5 files changed, 156 insertions(+), 156 deletions(-) diff --git a/ext/ldap/ldap.c b/ext/ldap/ldap.c index a25708f1dd459..e6e18154f9e2b 100644 --- a/ext/ldap/ldap.c +++ b/ext/ldap/ldap.c @@ -1601,12 +1601,12 @@ static void php_ldap_do_search(INTERNAL_FUNCTION_PARAMETERS, int scope) } if (!base_dn_str) { - zend_argument_type_error(2, "must be of type string when argument #1 ($link_identifier) is a resource"); + zend_argument_type_error(2, "must be of type string when argument #1 ($ldap) is a resource"); } ldap_base_dn = zend_string_copy(base_dn_str); if (!filter_str) { - zend_argument_type_error(3, "must be of type string when argument #1 ($link_identifier) is a resource"); + zend_argument_type_error(3, "must be of type string when argument #1 ($ldap) is a resource"); } ldap_filter = zend_string_copy(filter_str); diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index a5233f473eefc..cd0cfb6bf6abe 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -10,256 +10,256 @@ function ldap_connect(?string $uri = null, int $port = 389, string $wallet = UNK function ldap_connect(?string $uri = null, int $port = 389) {} #endif -/** @param resource $link */ -function ldap_unbind($link): bool {} +/** @param resource $ldap */ +function ldap_unbind($ldap): bool {} /** - * @param resource $link + * @param resource $ldap * @alias ldap_unbind */ -function ldap_close($link): bool {} +function ldap_close($ldap): bool {} -/** @param resource $link */ -function ldap_bind($link, ?string $dn = null, ?string $password = null): bool {} +/** @param resource $ldap */ +function ldap_bind($ldap, ?string $dn = null, ?string $password = null): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_bind_ext($link, ?string $dn = null, ?string $password = null, array $controls = []) {} +function ldap_bind_ext($ldap, ?string $dn = null, ?string $password = null, array $controls = []) {} #ifdef HAVE_LDAP_SASL -/** @param resource $link */ -function ldap_sasl_bind($link, ?string $dn = null, ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authc_id = null, ?string $authz_id = null, ?string $props = null): bool {} +/** @param resource $ldap */ +function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?string $mech = null, ?string $realm = null, ?string $authc_id = null, ?string $authz_id = null, ?string $props = null): bool {} #endif /** - * @param resource|array $link + * @param resource|array $ldap * @return resource|false */ -function ldap_read($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} +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 = []) {} /** - * @param resource|array $link + * @param resource|array $ldap * @return resource|false */ -function ldap_list($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} +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 = []) {} /** - * @param resource|array $link + * @param resource|array $ldap * @return resource|false */ -function ldap_search($link, array|string $base, array|string $filter, array $attributes = [], int $attrsonly = 0, int $sizelimit = -1, int $timelimit = -1, int $deref = LDAP_DEREF_NEVER, array $controls = []) {} +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 = []) {} -/** @param resource $link */ -function ldap_free_result($link): bool {} +/** @param resource $ldap */ +function ldap_free_result($ldap): bool {} /** - * @param resource $link + * @param resource $ldap * @param resource $result */ -function ldap_count_entries($link, $result): int {} +function ldap_count_entries($ldap, $result): int {} /** - * @param resource $link + * @param resource $ldap * @param resource $result * @return resource|false */ -function ldap_first_entry($link, $result) {} +function ldap_first_entry($ldap, $result) {} /** - * @param resource $link + * @param resource $ldap * @param resource $result * @return resource|false */ -function ldap_next_entry($link, $result) {} +function ldap_next_entry($ldap, $result) {} /** - * @param resource $link + * @param resource $ldap * @param resource $result */ -function ldap_get_entries($link, $result): array|false {} +function ldap_get_entries($ldap, $result): array|false {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry */ -function ldap_first_attribute($link, $entry): string|false {} +function ldap_first_attribute($ldap, $entry): string|false {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry */ -function ldap_next_attribute($link, $entry): string|false {} +function ldap_next_attribute($ldap, $entry): string|false {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry */ -function ldap_get_attributes($link, $entry): array {} +function ldap_get_attributes($ldap, $entry): array {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry */ -function ldap_get_values_len($link, $entry, string $attribute): array|false {} +function ldap_get_values_len($ldap, $entry, string $attribute): array|false {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry * @alias ldap_get_values_len */ -function ldap_get_values($link, $entry, string $attribute): array|false {} +function ldap_get_values($ldap, $entry, string $attribute): array|false {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry */ -function ldap_get_dn($link, $entry): string|false {} +function ldap_get_dn($ldap, $entry): string|false {} function ldap_explode_dn(string $dn, int $with_attrib): array|false {} function ldap_dn2ufn(string $dn): string|false {} -/** @param resource $link */ -function ldap_add($link, string $dn, array $entry, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_add($ldap, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_add_ext($link, string $dn, array $entry, array $controls = []) {} +function ldap_add_ext($ldap, string $dn, array $entry, array $controls = []) {} -/** @param resource $link */ -function ldap_delete($link, string $dn, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_delete($ldap, string $dn, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_delete_ext($link, string $dn, array $controls = []) {} +function ldap_delete_ext($ldap, string $dn, array $controls = []) {} -/** @param resource $link */ -function ldap_modify_batch($link, string $dn, array $modifications_info, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_modify_batch($ldap, string $dn, array $modifications_info, array $controls = []): bool {} -/** @param resource $link */ -function ldap_mod_add($link, string $dn, array $entry, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_mod_add($ldap, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_mod_add_ext($link, string $dn, array $entry, array $controls = []) {} +function ldap_mod_add_ext($ldap, string $dn, array $entry, array $controls = []) {} -/** @param resource $link */ -function ldap_mod_replace($link, string $dn, array $entry, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_mod_replace($ldap, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @alias ldap_mod_replace */ -function ldap_modify($link, string $dn, array $entry, array $controls = []): bool {} +function ldap_modify($ldap, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_mod_replace_ext($link, string $dn, array $entry, array $controls = []) {} +function ldap_mod_replace_ext($ldap, string $dn, array $entry, array $controls = []) {} -/** @param resource $link */ -function ldap_mod_del($link, string $dn, array $entry, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_mod_del($ldap, string $dn, array $entry, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_mod_del_ext($link, string $dn, array $entry, array $controls = []) {} +function ldap_mod_del_ext($ldap, string $dn, array $entry, array $controls = []) {} -/** @param resource $link */ -function ldap_errno($link): int {} +/** @param resource $ldap */ +function ldap_errno($ldap): int {} -/** @param resource $link */ -function ldap_error($link): string {} +/** @param resource $ldap */ +function ldap_error($ldap): string {} function ldap_err2str(int $errno): string {} -/** @param resource $link */ -function ldap_compare($link, string $dn, string $attribute, string $value, array $controls = []): bool|int {} +/** @param resource $ldap */ +function ldap_compare($ldap, string $dn, string $attribute, string $value, array $controls = []): bool|int {} #ifdef LDAP_CONTROL_PAGEDRESULTS /** - * @param resource $link + * @param resource $ldap * @deprecated since 7.4 */ -function ldap_control_paged_result($link, int $pagesize, bool $iscritical = false, string $cookie = ""): bool {} +function ldap_control_paged_result($ldap, int $pagesize, bool $iscritical = false, string $cookie = ""): bool {} /** - * @param resource $link + * @param resource $ldap * @param resource $result * @param string $cookie * @param int $estimated * @deprecated since 7.4 */ -function ldap_control_paged_result_response($link, $result, &$cookie = null, &$estimated = null): bool {} +function ldap_control_paged_result_response($ldap, $result, &$cookie = null, &$estimated = null): bool {} #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) -/** @param resource $link */ -function ldap_rename($link, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []): bool {} +/** @param resource $ldap */ +function ldap_rename($ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []): bool {} /** - * @param resource $link + * @param resource $ldap * @return resource|false */ -function ldap_rename_ext($link, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []) {} +function ldap_rename_ext($ldap, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []) {} /** - * @param resource $link + * @param resource $ldap * @param array|string|int $retval */ -function ldap_get_option($link, int $option, &$retval = null): bool {} +function ldap_get_option($ldap, int $option, &$retval = null): bool {} /** - * @param resource|null $link - * @param array|string|int|bool $newval + * @param resource|null $ldap + * @param array|string|int|bool $value */ -function ldap_set_option($link, int $option, $value): bool {} +function ldap_set_option($ldap, int $option, $value): bool {} /** - * @param resource $link + * @param resource $ldap * @param resource $result */ -function ldap_count_references($link, $result): int {} +function ldap_count_references($ldap, $result): int {} /** - * @param resource $link + * @param resource $ldap * @param resource $result * @return resource|false */ -function ldap_first_reference($link, $result) {} +function ldap_first_reference($ldap, $result) {} /** - * @param resource $link + * @param resource $ldap * @param resource $entry * @return resource|false */ -function ldap_next_reference($link, $entry) {} +function ldap_next_reference($ldap, $entry) {} #ifdef HAVE_LDAP_PARSE_REFERENCE /** - * @param resource $link + * @param resource $ldap * @param resource $entry * @param array $referrals */ -function ldap_parse_reference($link, $entry, &$referrals): bool {} +function ldap_parse_reference($ldap, $entry, &$referrals): bool {} #endif #ifdef HAVE_LDAP_PARSE_RESULT /** - * @param resource $link + * @param resource $ldap * @param resource $result * @param int $errcode * @param string $matcheddn @@ -267,18 +267,18 @@ function ldap_parse_reference($link, $entry, &$referrals): bool {} * @param array $referrals * @param array $controls */ -function ldap_parse_result($link, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {} +function ldap_parse_result($ldap, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {} #endif #endif #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC) -/** @param resource $link */ -function ldap_set_rebind_proc($link, ?callable $callback): bool {} +/** @param resource $ldap */ +function ldap_set_rebind_proc($ldap, ?callable $callback): bool {} #endif #ifdef HAVE_LDAP_START_TLS_S -/** @param resource $link */ -function ldap_start_tls($link): bool {} +/** @param resource $ldap */ +function ldap_start_tls($ldap): bool {} #endif function ldap_escape(string $value, string $ignore = "", int $flags = 0): string {} @@ -292,39 +292,39 @@ function ldap_8859_to_t61(string $value): string|false {} #ifdef HAVE_LDAP_EXTENDED_OPERATION_S /** - * @param resource $link + * @param resource $ldap * @param string $retdata * @param string $retoid * @return resource|bool */ -function ldap_exop($link, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {} +function ldap_exop($ldap, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {} #endif #ifdef HAVE_LDAP_PASSWD /** - * @param resource $link + * @param resource $ldap * @param array $controls */ -function ldap_exop_passwd($link, string $user = "", string $old_password = "", string $new_password = "", &$controls = null): string|bool {} +function ldap_exop_passwd($ldap, string $user = "", string $old_password = "", string $new_password = "", &$controls = null): string|bool {} #endif #ifdef HAVE_LDAP_WHOAMI_S -/** @param resource $link */ -function ldap_exop_whoami($link): string|bool {} +/** @param resource $ldap */ +function ldap_exop_whoami($ldap): string|bool {} #endif #ifdef HAVE_LDAP_REFRESH_S -/** @param resource $link */ -function ldap_exop_refresh($link, string $dn, int $ttl): int|false {} +/** @param resource $ldap */ +function ldap_exop_refresh($ldap, string $dn, int $ttl): int|false {} #endif #ifdef HAVE_LDAP_PARSE_EXTENDED_RESULT /** - * @param resource $link + * @param resource $ldap * @param resource $result * @param string $retdata * @param string $retoid */ -function ldap_parse_exop($link, $result, &$retdata = null, &$retoid = null): bool {} +function ldap_parse_exop($ldap, $result, &$retdata = null, &$retoid = null): bool {} #endif diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 25f8227911c29..24fe4c3acd8db 100644 --- a/ext/ldap/ldap_arginfo.h +++ b/ext/ldap/ldap_arginfo.h @@ -1,13 +1,13 @@ /* This is a generated file, edit the .stub.php file instead. - * Stub hash: 739893b4bf6f34da80b7c7b10a670c16d4239bdb */ + * Stub hash: 4802f25ebc9936ccd6e4705d07a49a61892b71f3 */ #if defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_connect, 0, 0, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, uri, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, port, IS_LONG, 0, "389") ZEND_ARG_TYPE_INFO(0, wallet, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, wallet_passwd, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, authmode, IS_LONG, 0, "GSLC_SSL_NO_AUTH") + ZEND_ARG_TYPE_INFO(0, password, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, auth_mode, IS_LONG, 0, "GSLC_SSL_NO_AUTH") ZEND_END_ARG_INFO() #endif @@ -19,19 +19,19 @@ ZEND_END_ARG_INFO() #endif ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_unbind, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_END_ARG_INFO() #define arginfo_ldap_close arginfo_ldap_unbind ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_bind, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_bind_ext, 0, 0, 1) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") @@ -39,7 +39,7 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_SASL) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_sasl_bind, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, dn, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, password, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, mech, IS_STRING, 1, "null") @@ -51,7 +51,7 @@ ZEND_END_ARG_INFO() #endif ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_read, 0, 0, 3) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]") @@ -69,36 +69,36 @@ ZEND_END_ARG_INFO() #define arginfo_ldap_free_result arginfo_ldap_unbind ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_entries, 0, 2, IS_LONG, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_entry, 0, 0, 2) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #define arginfo_ldap_next_entry arginfo_ldap_first_entry ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_entries, 0, 2, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) 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) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() #define arginfo_ldap_next_attribute arginfo_ldap_first_attribute ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_attributes, 0, 2, IS_ARRAY, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_get_values_len, 0, 3, MAY_BE_ARRAY|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, entry) ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0) ZEND_END_ARG_INFO() @@ -117,33 +117,33 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_dn2ufn, 0, 1, MAY_BE_STRING ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_add, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_add_ext, 0, 0, 3) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, entry, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_delete, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_delete_ext, 0, 0, 2) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_modify_batch, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, modifications_info, IS_ARRAY, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") @@ -164,11 +164,11 @@ ZEND_END_ARG_INFO() #define arginfo_ldap_mod_del_ext arginfo_ldap_add_ext ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_errno, 0, 1, IS_LONG, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_error, 0, 1, IS_STRING, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_err2str, 0, 1, IS_STRING, 0) @@ -176,7 +176,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_err2str, 0, 1, IS_STRING, 0 ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_compare, 0, 4, MAY_BE_BOOL|MAY_BE_LONG) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, attribute, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) @@ -185,7 +185,7 @@ ZEND_END_ARG_INFO() #if defined(LDAP_CONTROL_PAGEDRESULTS) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_control_paged_result, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, pagesize, IS_LONG, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, iscritical, _IS_BOOL, 0, "false") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, cookie, IS_STRING, 0, "\"\"") @@ -194,7 +194,7 @@ ZEND_END_ARG_INFO() #if defined(LDAP_CONTROL_PAGEDRESULTS) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_control_paged_result_response, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, cookie, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, estimated, "null") @@ -203,18 +203,18 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_rename, 0, 5, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0) @@ -225,7 +225,7 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null") ZEND_END_ARG_INFO() @@ -233,36 +233,36 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_option, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) - ZEND_ARG_INFO(0, newval) + ZEND_ARG_INFO(0, value) ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_count_references, 0, 2, IS_LONG, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_first_reference, 0, 0, 2) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_next_reference, 0, 0, 2) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, entry) ZEND_END_ARG_INFO() #endif #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_REFERENCE) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_reference, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, entry) ZEND_ARG_INFO(1, referrals) ZEND_END_ARG_INFO() @@ -270,7 +270,7 @@ ZEND_END_ARG_INFO() #if (LDAP_API_VERSION > 2000) || defined(HAVE_ORALDAP) && defined(HAVE_LDAP_PARSE_RESULT) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO(1, errcode) ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null") @@ -282,14 +282,14 @@ ZEND_END_ARG_INFO() #if defined(LDAP_API_FEATURE_X_OPENLDAP) && defined(HAVE_3ARG_SETREBINDPROC) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_set_rebind_proc, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, callback, IS_CALLABLE, 1) ZEND_END_ARG_INFO() #endif #if defined(HAVE_LDAP_START_TLS_S) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_start_tls, 0, 1, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_END_ARG_INFO() #endif @@ -311,7 +311,7 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_EXTENDED_OPERATION_S) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]") @@ -322,23 +322,23 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_PASSWD) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_passwd, 0, 1, MAY_BE_STRING|MAY_BE_BOOL) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, user, IS_STRING, 0, "\"\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, oldpw, IS_STRING, 0, "\"\"") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, newpw, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, old_password, IS_STRING, 0, "\"\"") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, new_password, IS_STRING, 0, "\"\"") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null") ZEND_END_ARG_INFO() #endif #if defined(HAVE_LDAP_WHOAMI_S) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_whoami, 0, 1, MAY_BE_STRING|MAY_BE_BOOL) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_END_ARG_INFO() #endif #if defined(HAVE_LDAP_REFRESH_S) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_ldap_exop_refresh, 0, 3, MAY_BE_LONG|MAY_BE_FALSE) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) ZEND_ARG_TYPE_INFO(0, ttl, IS_LONG, 0) ZEND_END_ARG_INFO() @@ -346,7 +346,7 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_PARSE_EXTENDED_RESULT) ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL, 0) - ZEND_ARG_INFO(0, link) + ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null") diff --git a/ext/ldap/tests/ldap_search_error.phpt b/ext/ldap/tests/ldap_search_error.phpt index 2eec205ef58a3..7041c66746b01 100644 --- a/ext/ldap/tests/ldap_search_error.phpt +++ b/ext/ldap/tests/ldap_search_error.phpt @@ -46,6 +46,6 @@ bool(false) Warning: ldap_search(): Array initialization wrong in %s on line %d bool(false) -ldap_search(): Argument #1 ($link) cannot be empty +ldap_search(): Argument #1 ($ldap) cannot be empty ldap_search(): Argument #2 ($base) must have the same number of elements as the links array ldap_search(): Argument #3 ($filter) must have the same number of elements as the links array diff --git a/ext/ldap/tests/ldap_set_option_error.phpt b/ext/ldap/tests/ldap_set_option_error.phpt index f97193e22b581..fba37df6ef34d 100644 --- a/ext/ldap/tests/ldap_set_option_error.phpt +++ b/ext/ldap/tests/ldap_set_option_error.phpt @@ -38,6 +38,6 @@ var_dump(ldap_set_option($link, 999999, 999999)); --EXPECT-- bool(false) ValueError: ldap_set_option(): Control must have an "oid" key -TypeError: ldap_set_option(): Argument #3 ($newval) must contain only arrays, where each array is a control -TypeError: ldap_set_option(): Argument #3 ($newval) must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, string given +TypeError: ldap_set_option(): Argument #3 ($value) must contain only arrays, where each array is a control +TypeError: ldap_set_option(): Argument #3 ($value) must be of type array for the LDAP_OPT_CLIENT_CONTROLS option, string given bool(false) From 36830f61bf568271ec7f2e92fe5f928d82e0efe3 Mon Sep 17 00:00:00 2001 From: MCMic Date: Mon, 28 Sep 2020 16:32:57 +0200 Subject: [PATCH 15/16] Harmonize ldap_rename_ext with ldap_rename parameter names Co-authored-by: Nikita Popov --- ext/ldap/ldap.stub.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index cd0cfb6bf6abe..3a51986b4f256 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -213,7 +213,7 @@ function ldap_rename($ldap, string $dn, string $new_rdn, string $new_parent, boo * @param resource $ldap * @return resource|false */ -function ldap_rename_ext($ldap, string $dn, string $newrdn, string $newparent, bool $deleteoldrdn, array $controls = []) {} +function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent, bool $delete_old_rdn, array $controls = []) {} /** From ac12ce10ed3cc2a6f60a23ace073b147631e37ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=B4me=20Chilliet?= Date: Tue, 29 Sep 2020 09:36:25 +0200 Subject: [PATCH 16/16] Improve parameter names in ext/ldap --- ext/ldap/ldap.stub.php | 30 +++++++++++++++--------------- ext/ldap/ldap_arginfo.h | 30 +++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php index 3a51986b4f256..df973b933cb33 100644 --- a/ext/ldap/ldap.stub.php +++ b/ext/ldap/ldap.stub.php @@ -37,19 +37,19 @@ function ldap_sasl_bind($ldap, ?string $dn = null, ?string $password = null, ?st * @param resource|array $ldap * @return resource|false */ -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 = []) {} +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 = []) {} /** * @param resource|array $ldap * @return resource|false */ -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 = []) {} +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 = []) {} /** * @param resource|array $ldap * @return resource|false */ -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 = []) {} +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 = []) {} /** @param resource $ldap */ function ldap_free_result($ldap): bool {} @@ -218,9 +218,9 @@ function ldap_rename_ext($ldap, string $dn, string $new_rdn, string $new_parent, /** * @param resource $ldap - * @param array|string|int $retval + * @param array|string|int $value */ -function ldap_get_option($ldap, int $option, &$retval = null): bool {} +function ldap_get_option($ldap, int $option, &$value = null): bool {} /** * @param resource|null $ldap @@ -261,13 +261,13 @@ function ldap_parse_reference($ldap, $entry, &$referrals): bool {} /** * @param resource $ldap * @param resource $result - * @param int $errcode - * @param string $matcheddn - * @param string $errmsg + * @param int $error_code + * @param string $matched_dn + * @param string $error_message * @param array $referrals * @param array $controls */ -function ldap_parse_result($ldap, $result, &$errcode, &$matcheddn = null, &$errmsg = null, &$referrals = null, &$controls = null): bool {} +function ldap_parse_result($ldap, $result, &$error_code, &$matched_dn = null, &$error_message = null, &$referrals = null, &$controls = null): bool {} #endif #endif @@ -293,11 +293,11 @@ function ldap_8859_to_t61(string $value): string|false {} #ifdef HAVE_LDAP_EXTENDED_OPERATION_S /** * @param resource $ldap - * @param string $retdata - * @param string $retoid + * @param string $response_data + * @param string $response_oid * @return resource|bool */ -function ldap_exop($ldap, string $reqoid, ?string $reqdata = null, ?array $controls = [], &$retdata = null, &$retoid = null) {} +function ldap_exop($ldap, string $request_oid, ?string $request_data = null, ?array $controls = [], &$response_data = null, &$response_oid = null) {} #endif #ifdef HAVE_LDAP_PASSWD @@ -323,8 +323,8 @@ function ldap_exop_refresh($ldap, string $dn, int $ttl): int|false {} /** * @param resource $ldap * @param resource $result - * @param string $retdata - * @param string $retoid + * @param string $response_data + * @param string $response_oid */ -function ldap_parse_exop($ldap, $result, &$retdata = null, &$retoid = null): bool {} +function ldap_parse_exop($ldap, $result, &$response_data = null, &$response_oid = null): bool {} #endif diff --git a/ext/ldap/ldap_arginfo.h b/ext/ldap/ldap_arginfo.h index 24fe4c3acd8db..4b73b68d8f32c 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: 4802f25ebc9936ccd6e4705d07a49a61892b71f3 */ + * Stub hash: 0c721a3272fef9d1a06a8cb4163eeb219661fb00 */ #if defined(HAVE_ORALDAP) 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) ZEND_ARG_TYPE_MASK(0, base, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_MASK(0, filter, MAY_BE_ARRAY|MAY_BE_STRING, NULL) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes, IS_ARRAY, 0, "[]") - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attrsonly, IS_LONG, 0, "0") + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, attributes_only, IS_LONG, 0, "0") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, sizelimit, IS_LONG, 0, "-1") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timelimit, IS_LONG, 0, "-1") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, deref, IS_LONG, 0, "LDAP_DEREF_NEVER") @@ -216,9 +216,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_rename_ext, 0, 0, 5) ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, dn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, newrdn, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, newparent, IS_STRING, 0) - ZEND_ARG_TYPE_INFO(0, deleteoldrdn, _IS_BOOL, 0) + ZEND_ARG_TYPE_INFO(0, new_rdn, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, new_parent, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, delete_old_rdn, _IS_BOOL, 0) ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 0, "[]") ZEND_END_ARG_INFO() #endif @@ -227,7 +227,7 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_get_option, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, ldap) ZEND_ARG_TYPE_INFO(0, option, IS_LONG, 0) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retval, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, value, "null") ZEND_END_ARG_INFO() #endif @@ -272,9 +272,9 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_result, 0, 3, _IS_BOOL, 0) ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) - ZEND_ARG_INFO(1, errcode) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matcheddn, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, errmsg, "null") + ZEND_ARG_INFO(1, error_code) + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, matched_dn, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, error_message, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, referrals, "null") ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, controls, "null") ZEND_END_ARG_INFO() @@ -312,11 +312,11 @@ ZEND_END_ARG_INFO() #if defined(HAVE_LDAP_EXTENDED_OPERATION_S) ZEND_BEGIN_ARG_INFO_EX(arginfo_ldap_exop, 0, 0, 2) ZEND_ARG_INFO(0, ldap) - ZEND_ARG_TYPE_INFO(0, reqoid, IS_STRING, 0) - ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, reqdata, IS_STRING, 1, "null") + ZEND_ARG_TYPE_INFO(0, request_oid, IS_STRING, 0) + ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, request_data, IS_STRING, 1, "null") ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, controls, IS_ARRAY, 1, "[]") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null") ZEND_END_ARG_INFO() #endif @@ -348,8 +348,8 @@ ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_ldap_parse_exop, 0, 2, _IS_BOOL, 0) ZEND_ARG_INFO(0, ldap) ZEND_ARG_INFO(0, result) - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retdata, "null") - ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, retoid, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_data, "null") + ZEND_ARG_INFO_WITH_DEFAULT_VALUE(1, response_oid, "null") ZEND_END_ARG_INFO() #endif