Fix parameter names in ext/ldap

Renamed all parameters to be consistent and concise

diff --git a/ext/ldap/ldap.stub.php b/ext/ldap/ldap.stub.php
index 507700365c8b81a7f2468c043eff78f8f3ff8b53..6cc89b613769660fe2ecd7b473f11e464bb9f6b1 100644 (file)
--- 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 ed97aae13245a3931e8206739647adf1b0cc5346..922e66997cb7192e7d07371b44cc6c8fd5b2cbb8 100644 (file)
--- 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 cc4653f2b7bf266f3f1bd9c3ea20f8fe311ea882..2eec205ef58a3d2e46495213e5cec298faa4e0f0 100644 (file)
--- 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